From 87b1b2398bfad7dedf092b289d75ab268c9bd934 Mon Sep 17 00:00:00 2001 From: zeaslity Date: Fri, 3 Feb 2023 16:32:46 +0800 Subject: [PATCH] [ server ] [ scheduler ]- fix bug -1 --- agent/src/main/resources/bootstrap.yml | 10 ++++----- .../service/ExecutionResultDaemonHandler.java | 2 +- .../job/ScheduleUpdateDBInfoJob.java | 21 +++++++++++++++++++ .../service/BuildStatusScheduleTask.java | 1 + .../io/wdd/source/shell/agent-shutdown.sh | 17 +++++++++++++++ .../io/wdd/source/shell/lib/wdd-lib-sys.sh | 8 +++---- 6 files changed, 49 insertions(+), 10 deletions(-) create mode 100644 server/src/main/java/io/wdd/rpc/scheduler/job/ScheduleUpdateDBInfoJob.java create mode 100644 source/src/main/java/io/wdd/source/shell/agent-shutdown.sh diff --git a/agent/src/main/resources/bootstrap.yml b/agent/src/main/resources/bootstrap.yml index 4b3844a..94ec790 100644 --- a/agent/src/main/resources/bootstrap.yml +++ b/agent/src/main/resources/bootstrap.yml @@ -19,8 +19,8 @@ spring: - group: local data-id: common-local.yaml -debug: true -logging: - level: - io.wdd.agent: - debug +#debug: true +#logging: +# level: +# io.wdd.agent: +# debug diff --git a/server/src/main/java/io/wdd/rpc/execute/service/ExecutionResultDaemonHandler.java b/server/src/main/java/io/wdd/rpc/execute/service/ExecutionResultDaemonHandler.java index 0d221f3..a915f9c 100644 --- a/server/src/main/java/io/wdd/rpc/execute/service/ExecutionResultDaemonHandler.java +++ b/server/src/main/java/io/wdd/rpc/execute/service/ExecutionResultDaemonHandler.java @@ -106,7 +106,7 @@ public class ExecutionResultDaemonHandler { .supplyAsync( () -> { while (true) { - + // todo 多条命令时，这里只能获取到一个结果 if (CollectionUtils.isNotEmpty(commandReaderConfig.getExecutionResult())) { return commandReaderConfig.getExecutionResult(); } diff --git a/server/src/main/java/io/wdd/rpc/scheduler/job/ScheduleUpdateDBInfoJob.java b/server/src/main/java/io/wdd/rpc/scheduler/job/ScheduleUpdateDBInfoJob.java new file mode 100644 index 0000000..a3df0a7 --- /dev/null +++ b/server/src/main/java/io/wdd/rpc/scheduler/job/ScheduleUpdateDBInfoJob.java @@ -0,0 +1,21 @@ +package io.wdd.rpc.scheduler.job; + + +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.scheduling.quartz.QuartzJobBean; + +/** + * 间隔时间较长，定时更新数据库信息 + * 1. APPInfo + * 2. 补全Agent的各项信息 + * 3. 补全Agent存活失联状态 + * + */ +public class ScheduleUpdateDBInfoJob extends QuartzJobBean { + + @Override + protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException { + + } +} diff --git a/server/src/main/java/io/wdd/rpc/scheduler/service/BuildStatusScheduleTask.java b/server/src/main/java/io/wdd/rpc/scheduler/service/BuildStatusScheduleTask.java index 0a53be2..f8cc610 100644 --- a/server/src/main/java/io/wdd/rpc/scheduler/service/BuildStatusScheduleTask.java +++ b/server/src/main/java/io/wdd/rpc/scheduler/service/BuildStatusScheduleTask.java @@ -27,6 +27,7 @@ public class BuildStatusScheduleTask { @Value(value = "${octopus.status.healthy.cron}") String healthyCronTimeExpress; + // todo 此时间可以更新Nacos配置更新 自动进行任务更新 @Value(value = "${octopus.status.healthy.start-delay}") int healthyCheckStartDelaySeconds; diff --git a/source/src/main/java/io/wdd/source/shell/agent-shutdown.sh b/source/src/main/java/io/wdd/source/shell/agent-shutdown.sh new file mode 100644 index 0000000..e00d775 --- /dev/null +++ b/source/src/main/java/io/wdd/source/shell/agent-shutdown.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +##### environment variables ###### +. /octopus-agent/shell/lib/wdd-lib-log.sh +. /octopus-agent/shell/lib/wdd-lib-sys.sh + + +log "Octopus Agent Shutdown !" + +FunctionStart + +FunctionEnd + +log "是真的关闭OctopusAgent啦！！！ 您再也找不到了 呜呜呜呜！" +systemctl stop octopus-agent + + 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 b68862a..31630c2 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 @@ -135,12 +135,12 @@ FunctionEnd() { tmp () { -gcloud compute instances create octopus-agent-2c-4g-1 --project=compact-lacing-371804 --zone=asia-northeast1-b --machine-type=n2d-custom-2-4096 --network-interface=network-tier=PREMIUM,subnet=default --metadata=startup-script=wget\ https://raw.githubusercontent.com/zeaslity/ProjectOctopus/main/source/src/main/java/io/wdd/source/shell/agent-bootup.sh\ \&\&\ chmod\ \+x\ agent-bootup.sh\ \&\&\ /bin/bash\ agent-bootup.sh --can-ip-forward --maintenance-policy=MIGRATE --provisioning-model=STANDARD --service-account=172889627951-compute@developer.gserviceaccount.com --scopes=https://www.googleapis.com/auth/devstorage.read_only,https://www.googleapis.com/auth/logging.write,https://www.googleapis.com/auth/monitoring.write,https://www.googleapis.com/auth/servicecontrol,https://www.googleapis.com/auth/service.management.readonly,https://www.googleapis.com/auth/trace.append --create-disk=auto-delete=yes,boot=yes,device-name=octopus-agent-2c-4g,image=projects/ubuntu-os-cloud/global/images/ubuntu-2004-focal-v20221213,mode=rw,size=20,type=projects/compact-lacing-371804/zones/us-west4-b/diskTypes/pd1-ssd --no-shielded-secure-boot --shielded-vtpm --shielded-integrity-monitoring --reservation-affinity=any +gcloud compute instances create tokyo-amd64-07 --project=compact-lacing-371804 --zone=asia-northeast1-b --machine-type=n2d-custom-2-4096 --network-interface=network-tier=PREMIUM,subnet=default --metadata=startup-script=wget\ https://raw.githubusercontent.com/zeaslity/ProjectOctopus/main/source/src/main/java/io/wdd/source/shell/agent-bootup.sh\ \&\&\ chmod\ \+x\ agent-bootup.sh\ \&\&\ /bin/bash\ agent-bootup.sh --can-ip-forward --maintenance-policy=MIGRATE --provisioning-model=STANDARD --service-account=172889627951-compute@developer.gserviceaccount.com --scopes=https://www.googleapis.com/auth/devstorage.read_only,https://www.googleapis.com/auth/logging.write,https://www.googleapis.com/auth/monitoring.write,https://www.googleapis.com/auth/servicecontrol,https://www.googleapis.com/auth/service.management.readonly,https://www.googleapis.com/auth/trace.append --create-disk=auto-delete=yes,boot=yes,device-name=octopus-agent-2c-4g,image=projects/ubuntu-os-cloud/global/images/ubuntu-2004-focal-v20221213,mode=rw,size=20,type=projects/compact-lacing-371804/zones/us-west4-b/diskTypes/pd1-ssd --no-shielded-secure-boot --shielded-vtpm --shielded-integrity-monitoring --reservation-affinity=any -gcloud compute instances create tokyo-amd64-13 --project=compact-lacing-371804 --zone=asia-northeast1-b --machine-type=n2d-custom-2-4096 --network-interface=network-tier=PREMIUM,subnet=default --can-ip-forward --maintenance-policy=MIGRATE --provisioning-model=STANDARD --service-account=172889627951-compute@developer.gserviceaccount.com --scopes=https://www.googleapis.com/auth/devstorage.read_only,https://www.googleapis.com/auth/logging.write,https://www.googleapis.com/auth/monitoring.write,https://www.googleapis.com/auth/servicecontrol,https://www.googleapis.com/auth/service.management.readonly,https://www.googleapis.com/auth/trace.append --create-disk=auto-delete=yes,boot=yes,device-name=octopus-agent-2c-4g,image=projects/ubuntu-os-cloud/global/images/ubuntu-2004-focal-v20221213,mode=rw,size=20,type=projects/compact-lacing-371804/zones/us-west4-b/diskTypes/pd-ssd --no-shielded-secure-boot --shielded-vtpm --shielded-integrity-monitoring --reservation-affinity=any +gcloud compute instances create tokyo-amd64-07 --project=compact-lacing-371804 --zone=asia-northeast1-b --machine-type=n2d-custom-2-4096 --network-interface=network-tier=PREMIUM,subnet=default --can-ip-forward --maintenance-policy=MIGRATE --provisioning-model=STANDARD --service-account=172889627951-compute@developer.gserviceaccount.com --scopes=https://www.googleapis.com/auth/devstorage.read_only,https://www.googleapis.com/auth/logging.write,https://www.googleapis.com/auth/monitoring.write,https://www.googleapis.com/auth/servicecontrol,https://www.googleapis.com/auth/service.management.readonly,https://www.googleapis.com/auth/trace.append --create-disk=auto-delete=yes,boot=yes,device-name=octopus-agent-2c-4g,image=projects/ubuntu-os-cloud/global/images/ubuntu-2004-focal-v20221213,mode=rw,size=20,type=projects/compact-lacing-371804/zones/us-west4-b/diskTypes/pd-ssd --no-shielded-secure-boot --shielded-vtpm --shielded-integrity-monitoring --reservation-affinity=any -gcloud compute ssh --zone "asia-northeast1-b" "tokyo-amd64-13" --project "compact-lacing-371804" +gcloud compute ssh --zone "asia-northeast1-b" "tokyo-amd64-07" --project "compact-lacing-371804" gcloud compute instances list --project "compact-lacing-371804" @@ -149,7 +149,7 @@ wget https://raw.githubusercontent.com/zeaslity/ProjectOctopus/main/source/src/m echo "y -" | gcloud compute instances delete tokyo-amd64-13 --project=compact-lacing-371804 --zone=asia-northeast1-b +" | gcloud compute instances delete tokyo-amd64-07 --project=compact-lacing-371804 --zone=asia-northeast1-b apt-cache madison openjdk-11-jdk | head -n 1 | awk '{print$3}'