From 1490fdfbb7b324e527a1d5c9865a5592ed885939 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 2 Aug 2023 14:44:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E9=BB=98=E8=AE=A4=E7=8A=B6=E6=80=81=E4=B8=BA?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: root --- sysom_server/sysom_api/apps/host/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysom_server/sysom_api/apps/host/models.py b/sysom_server/sysom_api/apps/host/models.py index 61f09f63..13ee7c1d 100644 --- a/sysom_server/sysom_api/apps/host/models.py +++ b/sysom_server/sysom_api/apps/host/models.py @@ -17,7 +17,7 @@ class HostModel(BaseModel): username = models.CharField(max_length=100) private_key = models.TextField(null=True) description = models.CharField(max_length=255, null=True) - status = models.IntegerField(choices=HOST_STATUS_CHOICES, default=2, verbose_name="主机状态") + status = models.IntegerField(choices=HOST_STATUS_CHOICES, default=1, verbose_name="主机状态") host_info = models.TextField(verbose_name='主机信息', default="") client_deploy_cmd = models.TextField(verbose_name="client部署命令", default="") cluster = models.ForeignKey('Cluster', on_delete=models.CASCADE, related_name='hosts', default="") -- Gitee From 1c0af542193e98c39d6727e3465d218d8b348b2d Mon Sep 17 00:00:00 2001 From: xinhaitao Date: Wed, 2 Aug 2023 15:15:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=9A=E5=8F=B0=E6=9C=BA=E5=99=A8?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=89=B9=E9=87=8F=E8=AF=84=E4=BC=B0=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=EF=BC=8C=E7=B3=BB=E7=BB=9F=E6=8A=A5Execute=20job=20ti?= =?UTF-8?q?meout=EF=BC=8C=E8=B0=83=E6=95=B4channel=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=97=B6=E7=9A=84=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xinhaitao --- sysom_server/sdk/channel_job/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysom_server/sdk/channel_job/model.py b/sysom_server/sdk/channel_job/model.py index 61028493..5b460217 100644 --- a/sysom_server/sdk/channel_job/model.py +++ b/sysom_server/sdk/channel_job/model.py @@ -26,7 +26,7 @@ class JobEntry: self.job_id = job_id self.echo = echo self.listen_topic = listen_topic - self.timeout = kwargs.get("timeout", 1000) + self.timeout = kwargs.get("timeout", 5000) self.auto_retry = kwargs.get("auto_retry", False) # This field indicates whether the execution results need to # be returned as streamed -- Gitee