diff --git a/mon/mon.js b/mon/mon.js index cf531766..bab3d9b0 100644 --- a/mon/mon.js +++ b/mon/mon.js @@ -83,7 +83,7 @@ const etcd_tree = { osd_ping_timeout: 5, // seconds. min: 1 up_wait_retry_interval: 500, // ms. min: 50 // osd - etcd_report_interval: 30, // min: 10 + etcd_report_interval: 5, run_primary: true, bind_address: "0.0.0.0", bind_port: 0, diff --git a/src/cli.cpp b/src/cli.cpp index d24f1d66..b309bfd8 100644 --- a/src/cli.cpp +++ b/src/cli.cpp @@ -102,7 +102,7 @@ void cli_tool_t::help() " Remove or all layers between and ( must be a child of ),\n" " rebasing all their children accordingly. --writers-stopped allows merging to be a bit\n" " more effective in case of a single 'slim' read-write child and 'fat' removed parent:\n" - " the child is merged into parent in that case and parent is renamed to child.\n" + " the child is merged into parent and parent is renamed to child in that case.\n" " In other cases parent layers are always merged into children.\n" "\n" "%s flatten [OPTIONS] \n" diff --git a/src/osd.cpp b/src/osd.cpp index 239f29c2..44735b7e 100644 --- a/src/osd.cpp +++ b/src/osd.cpp @@ -110,7 +110,7 @@ void osd_t::parse_config(const json11::Json & config) log_level = config["log_level"].uint64_value(); etcd_report_interval = config["etcd_report_interval"].uint64_value(); if (etcd_report_interval <= 0) - etcd_report_interval = 30; + etcd_report_interval = 5; readonly = config["readonly"] == "true" || config["readonly"] == "1" || config["readonly"] == "yes"; run_primary = config["run_primary"] != "false" && config["run_primary"] != "0" && config["run_primary"] != "no"; no_rebalance = config["no_rebalance"] == "true" || config["no_rebalance"] == "1" || config["no_rebalance"] == "yes"; diff --git a/src/osd.h b/src/osd.h index e3071e8e..290edc16 100644 --- a/src/osd.h +++ b/src/osd.h @@ -94,7 +94,7 @@ class osd_t // config json11::Json::object config; - int etcd_report_interval = 30; + int etcd_report_interval = 5; bool readonly = false; osd_num_t osd_num = 1; // OSD numbers start with 1