From 1e36225070e5eb367cad7d1a0553459bb89c31b8 Mon Sep 17 00:00:00 2001
From: QinZuoyan <qinzuoyan@gmail.com>
Date: Tue, 20 Nov 2018 19:51:39 +0800
Subject: [PATCH] misc: update rdsn; update config; update falcon_screen.json
 (#218)

---
 rdsn                         |  2 +-
 scripts/falcon_screen.json   | 10 +++++-----
 src/server/config-server.ini |  2 ++
 src/server/config.ini        |  2 ++
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/rdsn b/rdsn
index bb2fb74bee..254106639f 160000
--- a/rdsn
+++ b/rdsn
@@ -1 +1 @@
-Subproject commit bb2fb74bee731128e8ca88ceba1804cef967a16a
+Subproject commit 254106639febed1da5ff56a9534e4e527799fb17
diff --git a/scripts/falcon_screen.json b/scripts/falcon_screen.json
index 21d2514511..9f34836e70 100644
--- a/scripts/falcon_screen.json
+++ b/scripts/falcon_screen.json
@@ -170,10 +170,10 @@
       "timespan": 86400
     },
     {
-      "title": "SST文件个数（统计各表的单备份数据sstable文件个数）",
-      "endpoints": ["cluster=${cluster.name} job=collector service=pegasus"],
+      "title": "各节点SharedLog大小（单位：MB）",
+      "endpoints": ["cluster=${cluster.name} job=replica service=pegasus"],
       "counters": [
-          "collector*app.pegasus*app.stat.storage_count#${for.each.table}/cluster=${cluster.name},job=collector,port=${collector.port},service=pegasus"
+          "replica*eon.replica_stub*shared.log.size(MB)/cluster=${cluster.name},job=replica,port=${replica.port},service=pegasus"
       ],
       "graph_type": "a",
       "method": "",
@@ -190,10 +190,10 @@
       "timespan": 86400
     },
     {
-      "title": "各节点SharedLog大小（单位：MB）",
+      "title": "各节点SharedLog最近写入字节数",
       "endpoints": ["cluster=${cluster.name} job=replica service=pegasus"],
       "counters": [
-          "replica*eon.replica_stub*shared.log.size(MB)/cluster=${cluster.name},job=replica,port=${replica.port},service=pegasus"
+          "replica*eon.replica_stub*shared.log.recent.write.size/cluster=${cluster.name},job=replica,port=${replica.port},service=pegasus"
       ],
       "graph_type": "a",
       "method": "",
diff --git a/src/server/config-server.ini b/src/server/config-server.ini
index fd4b27d8da..47eda99d12 100644
--- a/src/server/config-server.ini
+++ b/src/server/config-server.ini
@@ -238,6 +238,8 @@ log_shared_file_size_mb = 32
 log_shared_file_count_limit = 32
 log_shared_batch_buffer_kb = 0
 log_shared_force_flush = false
+log_shared_pending_size_throttling_threshold_kb = 0
+log_shared_pending_size_throttling_delay_ms = 0
 
 config_sync_disabled = false
 config_sync_interval_ms = 30000
diff --git a/src/server/config.ini b/src/server/config.ini
index 950a6e9bdd..d1fa49bbd8 100644
--- a/src/server/config.ini
+++ b/src/server/config.ini
@@ -226,6 +226,8 @@
   log_shared_file_count_limit = 100
   log_shared_batch_buffer_kb = 0
   log_shared_force_flush = false
+  log_shared_pending_size_throttling_threshold_kb = 0
+  log_shared_pending_size_throttling_delay_ms = 0
 
   config_sync_disabled = false
   config_sync_interval_ms = 30000