From 162602bff5f6e81dc930f27746235d2adce0a53c Mon Sep 17 00:00:00 2001 From: HeYuchen <377710264@qq.com> Date: Wed, 19 Feb 2020 22:21:46 +0800 Subject: [PATCH] feat(split): add partition_version (#394) --- include/dsn/dist/replication/replication_app_base.h | 7 +++++++ src/dist/replication/lib/replica.cpp | 1 + src/dist/replication/lib/replica.h | 3 +++ src/dist/replication/lib/replica_init.cpp | 1 + .../replication/test/replica_test/unit_test/mock_utils.h | 3 +++ 5 files changed, 15 insertions(+) diff --git a/include/dsn/dist/replication/replication_app_base.h b/include/dsn/dist/replication/replication_app_base.h index 97c1398020..628c31d9e9 100644 --- a/include/dsn/dist/replication/replication_app_base.h +++ b/include/dsn/dist/replication/replication_app_base.h @@ -228,6 +228,13 @@ class replication_app_base : public replica_base // query app envs. virtual void query_app_envs(/*out*/ std::map &envs) = 0; + // `partition_version` is used to guarantee data consistency during partition split. + // In normal cases, partition_version = partition_count-1, when this replica rejects read + // and write request, partition_version = -1. + // + // Thread-safe. + virtual void set_partition_version(int32_t partition_version){}; + public: // // utility functions to be used by app diff --git a/src/dist/replication/lib/replica.cpp b/src/dist/replication/lib/replica.cpp index b25bc8fbba..f3d77366cf 100644 --- a/src/dist/replication/lib/replica.cpp +++ b/src/dist/replication/lib/replica.cpp @@ -65,6 +65,7 @@ replica::replica( _options = &stub->options(); init_state(); _config.pid = gpid; + _partition_version = app.partition_count - 1; std::string counter_str = fmt::format("private.log.size(MB)@{}", gpid); _counter_private_log_size.init_app_counter( diff --git a/src/dist/replication/lib/replica.h b/src/dist/replication/lib/replica.h index 59055341f2..1c38df9b86 100644 --- a/src/dist/replication/lib/replica.h +++ b/src/dist/replication/lib/replica.h @@ -494,6 +494,9 @@ class replica : public serverlet, public ref_counter, public replica_ba // ballot when starting partition split and split will stop if ballot changed // _child_init_ballot = 0 if partition not in partition split ballot _child_init_ballot{0}; + // in normal cases, _partition_version = partition_count-1 + // when replica reject client read write request, partition_version = -1 + std::atomic _partition_version; // perf counters perf_counter_wrapper _counter_private_log_size; diff --git a/src/dist/replication/lib/replica_init.cpp b/src/dist/replication/lib/replica_init.cpp index 739e7e4508..f0563130f3 100644 --- a/src/dist/replication/lib/replica_init.cpp +++ b/src/dist/replication/lib/replica_init.cpp @@ -312,6 +312,7 @@ error_code replica::init_app_and_prepare_list(bool create_new) _app = nullptr; } else { _is_initializing = true; + _app->set_partition_version(_app_info.partition_count - 1); if (nullptr == _private_log) { ddebug("%s: clear private log, dir = %s", name(), log_dir.c_str()); diff --git a/src/dist/replication/test/replica_test/unit_test/mock_utils.h b/src/dist/replication/test/replica_test/unit_test/mock_utils.h index e368966dd1..2ccd1d2736 100644 --- a/src/dist/replication/test/replica_test/unit_test/mock_utils.h +++ b/src/dist/replication/test/replica_test/unit_test/mock_utils.h @@ -69,6 +69,9 @@ class mock_replication_app_base : public replication_app_base void query_app_envs(std::map &out) override { out = _envs; } decree last_durable_decree() const override { return 0; } + // TODO(heyuchen): implement this function in further pull request + void set_partition_version(int32_t partition_version) override {} + private: std::map _envs; decree _decree = 5;