diff --git a/.github/workflows/build-push-docker.yml b/.github/workflows/build-push-docker.yml index b6ca512..91bdde5 100644 --- a/.github/workflows/build-push-docker.yml +++ b/.github/workflows/build-push-docker.yml @@ -95,15 +95,15 @@ jobs: latest {{date 'YYYY-MM-DD-HH-mm'}} - - name: Build My Base Image - uses: docker/build-push-action@v3.2.0 - with: - context: ./ - # Path to the Dockerfile - file: ./source/src/main/java/io/wdd/source/build-my-own-base-image.dockerfile - platforms: linux/amd64,linux/arm64 - push: true - tags: ${{ steps.docker_tags_base.outputs.tags }} +# - name: Build My Base Image +# uses: docker/build-push-action@v3.2.0 +# with: +# context: ./ +# # Path to the Dockerfile +# file: ./source/src/main/java/io/wdd/source/build-my-own-base-image.dockerfile +# platforms: linux/amd64,linux/arm64 +# push: true +# tags: ${{ steps.docker_tags_base.outputs.tags }} - name: Cache uses: actions/cache@v3.2.0 diff --git a/server/src/main/java/io/wdd/rpc/agent/OctopusAgentServiceImpl.java b/server/src/main/java/io/wdd/rpc/agent/OctopusAgentServiceImpl.java index 280e247..1f4158c 100644 --- a/server/src/main/java/io/wdd/rpc/agent/OctopusAgentServiceImpl.java +++ b/server/src/main/java/io/wdd/rpc/agent/OctopusAgentServiceImpl.java @@ -67,6 +67,7 @@ public class OctopusAgentServiceImpl implements OctopusAgentService { CountDownLatch countDownLatch = new CountDownLatch(ALL_HEALTHY_AGENT_TOPIC_NAME_LIST.size()); + // todo 此处存在重大bug,会导致CPU占用飙升 CompletableFuture getAllAgentVersionInfoFuture = waitCollectAllAgentVersionInfo( result, currentTime, diff --git a/server/src/main/java/io/wdd/rpc/message/handler/OctopusMessageHandler.java b/server/src/main/java/io/wdd/rpc/message/handler/OctopusMessageHandler.java index 2175ab8..d37386d 100644 --- a/server/src/main/java/io/wdd/rpc/message/handler/OctopusMessageHandler.java +++ b/server/src/main/java/io/wdd/rpc/message/handler/OctopusMessageHandler.java @@ -81,7 +81,7 @@ public class OctopusMessageHandler { } - // todo what to do after received the result + // 将收到的消息,直接存储到 缓存队列中 log.debug("cache the octopus message to inner cache list !"); OCTOPUS_MESSAGE_FROM_AGENT.offer(octopusMessage); diff --git a/source/src/main/java/io/wdd/source/build-my-own-base-image.dockerfile b/source/src/main/java/io/wdd/source/build-my-own-base-image.dockerfile index 222aff6..bb94307 100644 --- a/source/src/main/java/io/wdd/source/build-my-own-base-image.dockerfile +++ b/source/src/main/java/io/wdd/source/build-my-own-base-image.dockerfile @@ -3,4 +3,5 @@ FROM eclipse-temurin:11-jdk-focal MAINTAINER zeaslity@gmail.com -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping net-tools dnsutils lsof curl wget mtr-tiny vim openssh-client && rm -rf /var/lib/apt/lists/* \ No newline at end of file +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends iputils-ping net-tools dnsutils lsof curl wget mtr-tiny vim openssh-client && rm -rf /var/lib/apt/lists/* + diff --git a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh index dcfd062..304175b 100644 --- a/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh +++ b/source/src/main/java/io/wdd/source/shell/lib/wdd-lib-sys.sh @@ -157,12 +157,7 @@ apt-cache madison openjdk-11-jdk | head -n 1 | awk '{print$3}' java -jar /octopus-agent/agent.jar -Xms128m -Xmx512m -Dfile.encoding=utf-8 --spring.profiles.active=k3s --spring.cloud.nacos.config.group=k3s --spring.cloud.nacos.config.extension-configs[0].dataId=common-k3s.yaml --spring.cloud.nacos.config.extension-configs[0].group=k3s -export OctopusServerContainerName="octopus-server" - -docker container stop ${OctopusServerContainerName} -sleep 2 -docker container rm ${OctopusServerContainerName} -docker image rmi icederce/wdd-octopus-server:latest +docker exec -it octopus-server /bin/bash -c "wget https://arthas.aliyun.com/arthas-boot.jar && java -jar arthas-boot.jar" }