new balancer adopted by zone rules

vesoft-inc · Dec 14, 2021 · a52fb46 · a52fb46
1 parent d06fd9f
commit a52fb46
Show file tree

Hide file tree

Showing 26 changed files with 1,745 additions and 1,960 deletions.
diff --git a/src/graph/executor/admin/SubmitJobExecutor.cpp b/src/graph/executor/admin/SubmitJobExecutor.cpp
@@ -109,7 +109,8 @@ Value SubmitJobExecutor::convertJobTimestampToDateTime(int64_t timestamp) {
 
 nebula::DataSet SubmitJobExecutor::buildShowResultData(
  const nebula::meta::cpp2::JobDesc &jd, const std::vector<nebula::meta::cpp2::TaskDesc> &td) {
- if (jd.get_cmd() == meta::cpp2::AdminCmd::DATA_BALANCE) {
+ if (jd.get_cmd() == meta::cpp2::AdminCmd::DATA_BALANCE ||
+ jd.get_cmd() == meta::cpp2::AdminCmd::ZONE_BALANCE) {
  nebula::DataSet v(
  {"Job Id(spaceId:partId)", "Command(src->dst)", "Status", "Start Time", "Stop Time"});
  const auto &paras = jd.get_paras();

diff --git a/src/graph/validator/AdminJobValidator.h b/src/graph/validator/AdminJobValidator.h
@@ -38,6 +38,7 @@ class AdminJobValidator final : public Validator {
  case meta::cpp2::AdminCmd::FLUSH:
  case meta::cpp2::AdminCmd::DATA_BALANCE:
  case meta::cpp2::AdminCmd::LEADER_BALANCE:
+ case meta::cpp2::AdminCmd::ZONE_BALANCE:
  return true;
  // TODO: Also space related, but not available in CreateJobExecutor now.
  case meta::cpp2::AdminCmd::DOWNLOAD:

diff --git a/src/interface/meta.thrift b/src/interface/meta.thrift
@@ -229,6 +229,7 @@ enum AdminCmd {
  DOWNLOAD = 7,
  INGEST = 8,
  LEADER_BALANCE = 9,
+ ZONE_BALANCE = 10,
  UNKNOWN = 99,
 } (cpp.enum_strict)
 

diff --git a/src/meta/CMakeLists.txt b/src/meta/CMakeLists.txt
@@ -67,6 +67,8 @@ nebula_add_library(
  processors/job/AdminJobProcessor.cpp
  processors/job/ReportTaskProcessor.cpp
  processors/job/JobUtils.cpp
+ processors/job/StorageJobExecutor.cpp
+ processors/job/JobExecutor.cpp
  processors/job/MetaJobExecutor.cpp
  processors/job/SimpleConcurrentJobExecutor.cpp
  processors/job/CompactJobExecutor.cpp