diff --git a/dbm-services/mongodb/db-tools/dbactuator/pkg/common/mongo_common.go b/dbm-services/mongodb/db-tools/dbactuator/pkg/common/mongo_common.go index e96c1e8286..43a89c8db8 100644 --- a/dbm-services/mongodb/db-tools/dbactuator/pkg/common/mongo_common.go +++ b/dbm-services/mongodb/db-tools/dbactuator/pkg/common/mongo_common.go @@ -203,7 +203,7 @@ func ShutdownMongoProcess(user string, instanceType string, binDir string, dbpat if _, err := util.RunBashCmd( cmd, "", nil, - 60*time.Second); err != nil { + 120*time.Second); err != nil { return err } return nil diff --git a/dbm-ui/backend/flow/engine/bamboo/scene/mongodb/sub_task/increase_mongos.py b/dbm-ui/backend/flow/engine/bamboo/scene/mongodb/sub_task/increase_mongos.py index 3caee476e1..878fb6029f 100644 --- a/dbm-ui/backend/flow/engine/bamboo/scene/mongodb/sub_task/increase_mongos.py +++ b/dbm-ui/backend/flow/engine/bamboo/scene/mongodb/sub_task/increase_mongos.py @@ -76,8 +76,7 @@ def increase_mongos(root_id: str, ticket_data: Optional[Dict], sub_kwargs: ActKw sub_get_kwargs.payload["config"]["port"] = sub_get_kwargs.payload["config_nodes"][0]["port"] sub_get_kwargs.payload["app"] = sub_get_kwargs.payload["db_app_abbr"] cluster_name = info["cluster_name"] - sub_get_kwargs.mongos_info["set_id"] = cluster_name - sub_get_kwargs.db_main_version = str(info["db_version"].split(".")[0]) + sub_get_kwargs.mongos_info["conf_set_id"] = "{}-conf".format(cluster_name) sub_get_kwargs.payload["key_file"] = sub_get_kwargs.get_conf(cluster_name=cluster_name)["key_file"] sub_get_kwargs.payload["nodes"] = [] sub_get_kwargs.payload["nodes"].append(sub_get_kwargs.payload["mongos_nodes"][0])