From 959089b919e0195c427785f9f1a14d8a1f434e80 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Tue, 17 Nov 2020 16:29:42 +0300 Subject: [PATCH] Enable progress_notify=true for etcd watches --- etcd_state_client.cpp | 4 ++++ mon/mon.js | 1 + 2 files changed, 5 insertions(+) diff --git a/etcd_state_client.cpp b/etcd_state_client.cpp index b4b91a2d..c50a252b 100644 --- a/etcd_state_client.cpp +++ b/etcd_state_client.cpp @@ -173,6 +173,7 @@ void etcd_state_client_t::start_etcd_watcher() { "range_end", base64_encode(etcd_prefix+"/config0") }, { "start_revision", etcd_watch_revision+1 }, { "watch_id", ETCD_CONFIG_WATCH_ID }, + { "progress_notify", true }, } } }).dump()); etcd_watch_ws->post_message(WS_TEXT, json11::Json(json11::Json::object { @@ -181,6 +182,7 @@ void etcd_state_client_t::start_etcd_watcher() { "range_end", base64_encode(etcd_prefix+"/osd/state0") }, { "start_revision", etcd_watch_revision+1 }, { "watch_id", ETCD_OSD_STATE_WATCH_ID }, + { "progress_notify", true }, } } }).dump()); etcd_watch_ws->post_message(WS_TEXT, json11::Json(json11::Json::object { @@ -189,6 +191,7 @@ void etcd_state_client_t::start_etcd_watcher() { "range_end", base64_encode(etcd_prefix+"/pg/state0") }, { "start_revision", etcd_watch_revision+1 }, { "watch_id", ETCD_PG_STATE_WATCH_ID }, + { "progress_notify", true }, } } }).dump()); etcd_watch_ws->post_message(WS_TEXT, json11::Json(json11::Json::object { @@ -197,6 +200,7 @@ void etcd_state_client_t::start_etcd_watcher() { "range_end", base64_encode(etcd_prefix+"/pg/history0") }, { "start_revision", etcd_watch_revision+1 }, { "watch_id", ETCD_PG_HISTORY_WATCH_ID }, + { "progress_notify", true }, } } }).dump()); } diff --git a/mon/mon.js b/mon/mon.js index ab2f0923..26e5734f 100644 --- a/mon/mon.js +++ b/mon/mon.js @@ -331,6 +331,7 @@ class Mon range_end: b64(this.etcd_prefix+'0'), start_revision: ''+this.etcd_watch_revision, watch_id: 1, + progress_notify: true, }, })); this.ws.on('message', (msg) =>