Skip to content

Commit

Permalink
Merge branch 'master' into hotkey-coarse
Browse files Browse the repository at this point in the history
  • Loading branch information
Smityz authored Oct 26, 2020
2 parents 6a6f941 + ab285d7 commit 08ebf7f
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 5 deletions.
2 changes: 1 addition & 1 deletion rdsn
Submodule rdsn updated 93 files
+6 −2 include/dsn/dist/replication/replication.codes.h
+9 −0 include/dsn/dist/replication/replication_enums.h
+14 −0 include/dsn/dist/replication/replication_types.h
+3 −3 src/aio/aio_provider.h
+1 −0 src/aio/disk_engine.h
+47 −139 src/aio/native_linux_aio_provider.cpp
+4 −34 src/aio/native_linux_aio_provider.h
+59 −116 src/block_service/block_service_manager.cpp
+5 −0 src/block_service/block_service_manager.h
+3 −3 src/block_service/local/local_service.cpp
+8 −1 src/block_service/test/block_service_manager_test.cpp
+1 −1 src/block_service/test/config-test.ini
+10 −0 src/common/replication_types.cpp
+2 −6 src/failure_detector/test/config-test.ini
+2 −2 src/failure_detector/test/config-whitelist-test-failed.ini
+2 −2 src/failure_detector/test/config-whitelist-test.ini
+14 −0 src/meta/meta_data.h
+74 −50 src/meta/meta_split_service.cpp
+115 −71 src/meta/test/meta_split_service_test.cpp
+2 −1 src/nfs/nfs_client_impl.cpp
+1 −1 src/replica/backup/test/config-test.ini
+1 −1 src/replica/bulk_load/test/config-test.ini
+1 −5 src/replica/duplication/test/config-test.ini
+1 −1 src/replica/mutation_log.cpp
+2 −2 src/replica/replica.cpp
+5 −0 src/replica/replica_check.cpp
+8 −0 src/replica/replica_config.cpp
+3 −1 src/replica/replication_app_base.cpp
+108 −61 src/replica/split/replica_split_manager.cpp
+4 −2 src/replica/split/replica_split_manager.h
+1 −5 src/replica/split/test/config-test.ini
+127 −102 src/replica/split/test/replica_split_test.cpp
+1 −5 src/replica/storage/simple_kv/config.ini
+1 −5 src/replica/storage/simple_kv/test/case-000.ini
+1 −5 src/replica/storage/simple_kv/test/case-001.ini
+1 −5 src/replica/storage/simple_kv/test/case-002.ini
+1 −5 src/replica/storage/simple_kv/test/case-003.ini
+1 −5 src/replica/storage/simple_kv/test/case-004.ini
+1 −5 src/replica/storage/simple_kv/test/case-005.ini
+1 −5 src/replica/storage/simple_kv/test/case-006.ini
+1 −5 src/replica/storage/simple_kv/test/case-100.ini
+1 −5 src/replica/storage/simple_kv/test/case-101.ini
+1 −5 src/replica/storage/simple_kv/test/case-102.ini
+1 −5 src/replica/storage/simple_kv/test/case-103.ini
+1 −5 src/replica/storage/simple_kv/test/case-104.ini
+1 −5 src/replica/storage/simple_kv/test/case-105.ini
+1 −5 src/replica/storage/simple_kv/test/case-106.ini
+1 −5 src/replica/storage/simple_kv/test/case-107.ini
+1 −5 src/replica/storage/simple_kv/test/case-108.ini
+1 −5 src/replica/storage/simple_kv/test/case-109.ini
+1 −5 src/replica/storage/simple_kv/test/case-200.ini
+1 −5 src/replica/storage/simple_kv/test/case-201.ini
+1 −5 src/replica/storage/simple_kv/test/case-202-0.ini
+1 −5 src/replica/storage/simple_kv/test/case-202-1.ini
+1 −5 src/replica/storage/simple_kv/test/case-203-0.ini
+1 −5 src/replica/storage/simple_kv/test/case-203-1.ini
+1 −5 src/replica/storage/simple_kv/test/case-204.ini
+1 −5 src/replica/storage/simple_kv/test/case-205.ini
+1 −5 src/replica/storage/simple_kv/test/case-206.ini
+1 −5 src/replica/storage/simple_kv/test/case-207.ini
+1 −5 src/replica/storage/simple_kv/test/case-208.ini
+1 −5 src/replica/storage/simple_kv/test/case-209.ini
+1 −5 src/replica/storage/simple_kv/test/case-210.ini
+1 −5 src/replica/storage/simple_kv/test/case-211.ini
+1 −5 src/replica/storage/simple_kv/test/case-212.ini
+1 −5 src/replica/storage/simple_kv/test/case-213.ini
+1 −5 src/replica/storage/simple_kv/test/case-214.ini
+1 −5 src/replica/storage/simple_kv/test/case-215.ini
+1 −5 src/replica/storage/simple_kv/test/case-216.ini
+1 −5 src/replica/storage/simple_kv/test/case-300-0.ini
+1 −5 src/replica/storage/simple_kv/test/case-300-1.ini
+1 −5 src/replica/storage/simple_kv/test/case-300-2.ini
+1 −5 src/replica/storage/simple_kv/test/case-301.ini
+1 −5 src/replica/storage/simple_kv/test/case-302.ini
+1 −5 src/replica/storage/simple_kv/test/case-303.ini
+1 −5 src/replica/storage/simple_kv/test/case-304.ini
+1 −5 src/replica/storage/simple_kv/test/case-305.ini
+1 −5 src/replica/storage/simple_kv/test/case-306.ini
+1 −5 src/replica/storage/simple_kv/test/case-307.ini
+1 −5 src/replica/storage/simple_kv/test/case-400.ini
+1 −5 src/replica/storage/simple_kv/test/case-401.ini
+1 −5 src/replica/storage/simple_kv/test/case-402.ini
+1 −5 src/replica/storage/simple_kv/test/case-600.ini
+1 −5 src/replica/storage/simple_kv/test/case-601.ini
+1 −5 src/replica/storage/simple_kv/test/case-602.ini
+1 −5 src/replica/storage/simple_kv/test/case-603.ini
+1 −5 src/replica/storage/simple_kv/test/config.ini
+1 −5 src/replica/test/config-test.ini
+1 −0 src/replica/test/log_file_test.cpp
+2 −0 src/replica/test/mock_utils.h
+11 −0 src/replication.thrift
+10 −7 src/runtime/test/netprovider.cpp
+2 −2 src/zookeeper/test/config-test.ini
2 changes: 1 addition & 1 deletion src/include/pegasus/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
// can be found in the LICENSE file in the root directory of this source tree.

#pragma once
#define PEGASUS_VERSION "1.13.SNAPSHOT"
#define PEGASUS_VERSION "2.1.SNAPSHOT"
7 changes: 6 additions & 1 deletion src/server/config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
name = replica
arguments =
ports = 34801
pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_FDS_SERVICE,THREAD_POOL_COMPACT,THREAD_POOL_INGESTION,THREAD_POOL_SLOG
pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_FDS_SERVICE,THREAD_POOL_COMPACT,THREAD_POOL_INGESTION,THREAD_POOL_SLOG,THREAD_POOL_PLOG
run = true
count = 1

Expand Down Expand Up @@ -152,6 +152,11 @@
name = slog
worker_count = 1

[threadpool.THREAD_POOL_PLOG]
name = plog
partitioned = true
worker_count = 4

[meta_server]
server_list = %{meta.server.list}
cluster_root = /pegasus/%{cluster.name}
Expand Down
7 changes: 6 additions & 1 deletion src/server/config.min.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
type = replica
name = replica
ports = @REPLICA_PORT@
pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_LOCAL_SERVICE,THREAD_POOL_COMPACT,THREAD_POOL_INGESTION,THREAD_POOL_SLOG
pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_LOCAL_SERVICE,THREAD_POOL_COMPACT,THREAD_POOL_INGESTION,THREAD_POOL_SLOG,THREAD_POOL_PLOG

[apps.collector]
name = collector
Expand Down Expand Up @@ -93,6 +93,11 @@
name = slog
worker_count = 1

[threadpool.THREAD_POOL_PLOG]
name = plog
partitioned = true
worker_count = 4

[meta_server]
server_list = @LOCAL_IP@:34601,@LOCAL_IP@:34602,@LOCAL_IP@:34603
cluster_root = /pegasus/onebox/@LOCAL_IP@
Expand Down
7 changes: 6 additions & 1 deletion src/server/test/config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type = replica
name = replica
arguments =
ports = @REPLICA_PORT@
pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_LOCAL_SERVICE,THREAD_POOL_FDS_SERVICE,THREAD_POOL_COMPACT,THREAD_POOL_SLOG
pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_LOCAL_SERVICE,THREAD_POOL_FDS_SERVICE,THREAD_POOL_COMPACT,THREAD_POOL_SLOG,THREAD_POOL_PLOG
run = true
count = 1

Expand Down Expand Up @@ -62,6 +62,11 @@ worker_count = 8
name = slog
worker_count = 1

[threadpool.THREAD_POOL_PLOG]
name = plog
partitioned = true
worker_count = 4

[threadpool.THREAD_POOL_REPLICATION]
name = replica
partitioned = true
Expand Down

0 comments on commit 08ebf7f

Please sign in to comment.