misc: update rdsn; update config; update falcon_screen.json (#218)

apache · Dec 14, 2018 · 1e36225 · 1e36225
1 parent 342cf71
commit 1e36225
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/rdsn b/rdsn
diff --git 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
@@ -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
@@ -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
+5 −0		bin/dsn.cmake
+1 −1		compile_thrift.py
+0 −1		src/CMakeLists.txt
+0 −1		src/apps/CMakeLists.txt
+0 −166		src/apps/skv/multi-meta.sh
+0 −14		src/apps/skv/simple_kv.thrift.annotations
+0 −8		src/apps/skv/test-n.cmd
+0 −15		src/apps/skv/test.cmd
+0 −165		src/apps/skv/vconfig.ini
+0 −29		src/apps/skv/vtest.cmd
+0 −75		src/apps/skv/vtest.sh
+1 −0		src/dist/replication/CMakeLists.txt
+14 −0		src/dist/replication/common/replication_common.cpp
+8 −0		src/dist/replication/common/replication_common.h
+5 −4		src/dist/replication/ddl_lib/replication_ddl_client.cpp
+20 −2		src/dist/replication/lib/mutation_log.cpp
+14 −5		src/dist/replication/lib/mutation_log.h
+2 −0		src/dist/replication/lib/replica.h
+24 −1		src/dist/replication/lib/replica_2pc.cpp
+15 −0		src/dist/replication/lib/replica_config.cpp
+13 −4		src/dist/replication/lib/replica_stub.cpp
+1 −0		src/dist/replication/lib/replica_stub.h
+1 −0		src/dist/replication/storage_engine/CMakeLists.txt
+0 −1		src/dist/replication/storage_engine/simple_kv/CMakeLists.txt
+0 −0		src/dist/replication/storage_engine/simple_kv/clear.sh
+0 −0		src/dist/replication/storage_engine/simple_kv/config.ini
+0 −0		src/dist/replication/storage_engine/simple_kv/run.sh
+3 −3		src/dist/replication/storage_engine/simple_kv/simple_kv.app.example.h
+4 −4		src/dist/replication/storage_engine/simple_kv/simple_kv.client.h
+0 −0		src/dist/replication/storage_engine/simple_kv/simple_kv.code.definition.h
+0 −0		src/dist/replication/storage_engine/simple_kv/simple_kv.main.cpp
+0 −0		src/dist/replication/storage_engine/simple_kv/simple_kv.server.h
+0 −0		src/dist/replication/storage_engine/simple_kv/simple_kv.server.impl.cpp
+0 −0		src/dist/replication/storage_engine/simple_kv/simple_kv.server.impl.h
+0 −0		src/dist/replication/storage_engine/simple_kv/simple_kv.thrift
+0 −0		src/dist/replication/storage_engine/simple_kv/simple_kv_types.cpp
+0 −0		src/dist/replication/storage_engine/simple_kv/simple_kv_types.h