From a66cc527cf962584d66343a81477566f8a88a7e8 Mon Sep 17 00:00:00 2001
From: qinzuoyan <qinzuoyan@xiaomi.com>
Date: Thu, 29 Mar 2018 19:44:20 +0800
Subject: [PATCH] update rdsn: improve manual compact

Summary: Ref T10570

Test Plan: N/A

Reviewers: sunweijie, cailiuyang, laiyingchun

Reviewed By: laiyingchun

Subscribers: #pegasus

Maniphest Tasks: T10570

Differential Revision: https://phabricator.d.xiaomi.net/D89338
---
 rdsn                                   | 2 +-
 src/server/config-server.ini           | 2 ++
 src/server/config.ini                  | 2 ++
 src/server/pegasus_counter_updater.cpp | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/rdsn b/rdsn
index f0ec078..2358ba6 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 8cff87f..2842341 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 db54b48..51a1c28 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 8265b26..b2babcb 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)",
-- 
GitLab