fix:修复存量配置兼容问题 (#1108)

polarismesh · May 5, 2023 · 04712bb · 04712bb
1 parent ea547f9
commit 04712bb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/admin/job/clean_deleted_client.go b/admin/job/clean_deleted_client.go
@@ -35,7 +35,9 @@ type cleanDeletedClientsJob struct {
 }
 
 func (job *cleanDeletedClientsJob) init(raw map[string]interface{}) error {
-	cfg := &CleanDeletedClientsJobConfig{}
+	cfg := &CleanDeletedClientsJobConfig{
+		ClientCleanTimeout: 10 * time.Minute,
+	}
 	decodeConfig := &mapstructure.DecoderConfig{
 		DecodeHook: mapstructure.StringToTimeDurationHookFunc(),
 		Result:     cfg,

diff --git a/admin/job/clean_deleted_instance.go b/admin/job/clean_deleted_instance.go
@@ -35,7 +35,9 @@ type cleanDeletedInstancesJob struct {
 }
 
 func (job *cleanDeletedInstancesJob) init(raw map[string]interface{}) error {
-	cfg := &CleanDeletedInstancesJobConfig{}
+	cfg := &CleanDeletedInstancesJobConfig{
+		InstanceCleanTimeout: 10 * time.Minute,
+	}
 	decodeConfig := &mapstructure.DecoderConfig{
 		DecodeHook: mapstructure.StringToTimeDurationHookFunc(),
 		Result:     cfg,

diff --git a/admin/job/delete_empty_service.go b/admin/job/delete_empty_service.go
@@ -44,7 +44,9 @@ type deleteEmptyAutoCreatedServiceJob struct {
 }
 
 func (job *deleteEmptyAutoCreatedServiceJob) init(raw map[string]interface{}) error {
-	cfg := &DeleteEmptyAutoCreatedServiceJobConfig{}
+	cfg := &DeleteEmptyAutoCreatedServiceJobConfig{
+		ServiceDeleteTimeout: 30 * time.Minute,
+	}
 	decodeConfig := &mapstructure.DecoderConfig{
 		DecodeHook: mapstructure.StringToTimeDurationHookFunc(),
 		Result:     cfg,
@@ -90,10 +92,6 @@ func (job *deleteEmptyAutoCreatedServiceJob) getAllEmptyAutoCreatedServices() []
 		if svc.IsAlias() {
 			return true, nil
 		}
-		v, ok := svc.Meta[service.MetadataInternalAutoCreated]
-		if !ok || v != "true" {
-			return true, nil
-		}
 		count := job.cacheMgn.Instance().GetInstancesCountByServiceID(svc.ID)
 		if count.TotalInstanceCount == 0 {
 			res = append(res, svc)

diff --git a/admin/job/delete_unhealthy_instance.go b/admin/job/delete_unhealthy_instance.go
@@ -40,7 +40,9 @@ type deleteUnHealthyInstanceJob struct {
 }
 
 func (job *deleteUnHealthyInstanceJob) init(raw map[string]interface{}) error {
-	cfg := &DeleteUnHealthyInstanceJobConfig{}
+	cfg := &DeleteUnHealthyInstanceJobConfig{
+		InstanceDeleteTimeout: 60 * time.Minute,
+	}
 	decodeConfig := &mapstructure.DecoderConfig{
 		DecodeHook: mapstructure.StringToTimeDurationHookFunc(),
 		Result:     cfg,

diff --git a/release/conf/polaris-server.yaml b/release/conf/polaris-server.yaml
@@ -408,13 +408,13 @@ maintain:
       enable: true
       option:
         # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
-        instanceCleanTimeout: 10m
+        # instanceCleanTimeout: 10m
     # Clean soft deleted clients
     - name: CleanDeletedClients
       enable: true
       option:
         # Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
-        clientCleanTimeout: 10m
+        # clientCleanTimeout: 10m
 
 # Storage configuration
 store: