diff --git a/rdsn b/rdsn index f0ec0783484053b68553a867e3caba14bb884819..2358ba662da981911d2c04a383633e59039ca5d4 160000 --- a/rdsn +++ b/rdsn @@ -1 +1 @@ -Subproject commit f0ec0783484053b68553a867e3caba14bb884819 +Subproject commit 2358ba662da981911d2c04a383633e59039ca5d4 diff --git a/src/server/config-server.ini b/src/server/config-server.ini index 8cff87fcf4f3947ffe8a6b79c4e7541ffc758cba..2842341edfde8601fcf6c5090681111cf5f6e9e4 100644 --- a/src/server/config-server.ini +++ b/src/server/config-server.ini @@ -244,6 +244,8 @@ cold_backup_root = onebox ;; upper limit that concurrent uploading file to cold backup media count max_concurrent_uploading_file_count = 5 +manual_compact_min_interval_seconds = 3600 + [pegasus.server] rocksdb_verbose_log = false rocksdb_write_buffer_size = 10485760 diff --git a/src/server/config.ini b/src/server/config.ini index db54b486bf9aa89ce48af0f3928238036158d10c..51a1c288ca19af66b1d4dc448f0a190d9053cce1 100644 --- a/src/server/config.ini +++ b/src/server/config.ini @@ -240,6 +240,8 @@ cold_backup_root = %{cluster.name} max_concurrent_uploading_file_count = 10 + manual_compact_min_interval_seconds = 3600 + [replication.app] app_name = temp app_type = pegasus diff --git a/src/server/pegasus_counter_updater.cpp b/src/server/pegasus_counter_updater.cpp index 8265b2623d6bba9f666842d44d7ccd4c41fc86f0..b2babcb65e71d42df0cd6d97d25020fe4f9357d5 100644 --- a/src/server/pegasus_counter_updater.cpp +++ b/src/server/pegasus_counter_updater.cpp @@ -36,6 +36,8 @@ static const char *s_brief_stat_mapper[] = { "closing_replica_count", "replica*eon.replica_stub*closing.replica(Count)", "commit_throughput", "replica*eon.replica_stub*replicas.commit.qps", "learning_count", "replica*eon.replica_stub*replicas.learning.count", + "manual_compact_running_count", "replica*eon.replica_stub*manual.compact.running.count", + "manual_compact_queue_count", "replica*eon.replica_stub*manual.compact.queue.count", "shared_log_size(MB)", "replica*eon.replica_stub*shared.log.size(MB)", "memused_virt(MB)", "replica*server*memused.virt(MB)", "memused_res(MB)", "replica*server*memused.res(MB)",