Merge branch 'fix-local-service' of github.com:neverchanje/rdsn into …

…fix-local-service
XiaoMi · Nov 18, 2020 · d46d52b · d46d52b
2 parents d9bb3b2 + bf5a24a
commit d46d52b
Show file tree

Hide file tree

Showing 17 changed files with 2,787 additions and 1,869 deletions.
diff --git a/include/dsn/dist/replication/replication.codes.h b/include/dsn/dist/replication/replication.codes.h
@@ -158,6 +158,7 @@ MAKE_EVENT_CODE_RPC(RPC_SPLIT_NOTIFY_CATCH_UP, TASK_PRIORITY_COMMON)
 MAKE_EVENT_CODE_RPC(RPC_SPLIT_UPDATE_CHILD_PARTITION_COUNT, TASK_PRIORITY_COMMON)
 MAKE_EVENT_CODE_RPC(RPC_BULK_LOAD, TASK_PRIORITY_COMMON)
 MAKE_EVENT_CODE_RPC(RPC_GROUP_BULK_LOAD, TASK_PRIORITY_COMMON)
+MAKE_EVENT_CODE_RPC(RPC_REPLICA_DISK_MIGRATE, TASK_PRIORITY_COMMON)
 MAKE_EVENT_CODE(LPC_REPLICATION_LOW, TASK_PRIORITY_LOW)
 MAKE_EVENT_CODE(LPC_REPLICATION_COMMON, TASK_PRIORITY_COMMON)
 MAKE_EVENT_CODE(LPC_REPLICATION_HIGH, TASK_PRIORITY_HIGH)

diff --git a/include/dsn/dist/replication/replication_enums.h b/include/dsn/dist/replication/replication_enums.h
@@ -107,4 +107,13 @@ ENUM_REG(replication::split_status::PAUSING)
 ENUM_REG(replication::split_status::PAUSED)
 ENUM_REG(replication::split_status::CANCELING)
 ENUM_END2(replication::split_status::type, split_status)
+
+ENUM_BEGIN2(replication::disk_migration_status::type,
+            disk_migration_status,
+            replication::disk_migration_status::IDLE)
+ENUM_REG(replication::disk_migration_status::IDLE)
+ENUM_REG(replication::disk_migration_status::MOVING)
+ENUM_REG(replication::disk_migration_status::MOVED)
+ENUM_REG(replication::disk_migration_status::CLOSED)
+ENUM_END2(replication::disk_migration_status::type, disk_migration_status)
 }
diff --git a/include/dsn/dist/replication/replication_types.h b/include/dsn/dist/replication/replication_types.h
diff --git a/src/common/fs_manager.h b/src/common/fs_manager.h
@@ -128,7 +128,8 @@ class fs_manager
 
     friend class replica_stub;
     friend class mock_replica_stub;
-    friend class replica_disk_test;
+    friend class replica_disk_migrator;
+    friend class replica_disk_test_base;
 };
 } // replication
 } // dsn