CCBC-1612: refresh configuration on errors when faster failover is enabled

Try to refresh configuration in case of network errors to speed up the
recovery process during failover.

Change-Id: Ieead623872105dc8660d492159f712475be45bff
Reviewed-on: https://review.couchbase.org/c/libcouchbase/+/197340
Reviewed-by: Jared Casey <[email protected]>
Tested-by: Build Bot <[email protected]>

Author: avsej

src/bootstrap.cc

@@ -295,7 +295,7 @@ lcb_STATUS Bootstrap::bootstrap(unsigned options)
         last_refresh = now;
     }
     if (parent->settings->bucket) {
-        options &= BS_REFRESH_OPEN_BUCKET;
+        options |= BS_REFRESH_OPEN_BUCKET;
     }
     parent->confmon->start(options);
     return LCB_SUCCESS;

src/bucketconfig/bc_cccp.cc

@@ -67,7 +67,7 @@ struct CccpProvider : public Provider {
     void configure_nodes(const lcb::Hostlist &) override;
     void config_updated(lcbvb_CONFIG *) override;
     void dump(FILE *) const override;
-    lcb_STATUS refresh() override;
+    lcb_STATUS refresh(unsigned options = 0) override;
 
     ConfigInfo *get_cached() override
     {
@@ -430,13 +430,14 @@ static void on_connected(lcbio_SOCKET *sock, void *data, lcb_STATUS err, lcbio_O
     cccp->request_config();
 }
 
-lcb_STATUS CccpProvider::refresh()
+lcb_STATUS CccpProvider::refresh(unsigned options)
 {
     if (has_pending_request()) {
         return LCB_ERR_BUSY;
     }
 
-    return schedule_next_request(LCB_SUCCESS, /* can_rollover */ true, /* skip_if_push_supported */ true);
+    return schedule_next_request(LCB_SUCCESS, /* can_rollover */ true,
+                                 /* skip_if_push_supported */ (options & lcb::BS_REFRESH_INCRERR) == 0);
 }
 
 bool CccpProvider::pause()

src/bucketconfig/bc_file.cc

@@ -49,7 +49,7 @@ struct FileProvider : Provider, Listener {
 
     /* Overrides */
     ConfigInfo *get_cached() override;
-    lcb_STATUS refresh() override;
+    lcb_STATUS refresh(unsigned options = 0) override;
     void dump(FILE *) const override;
     void clconfig_lsn(EventType, ConfigInfo *) override;
 
@@ -197,7 +197,7 @@ void FileProvider::reload_cache()
     }
 }
 
-lcb_STATUS FileProvider::refresh()
+lcb_STATUS FileProvider::refresh(unsigned /* options */)
 {
     if (!timer.is_armed()) {
         timer.signal();

src/bucketconfig/bc_http.cc

@@ -403,7 +403,7 @@ bool HttpProvider::pause()
     return LCB_SUCCESS;
 }
 
-lcb_STATUS HttpProvider::refresh()
+lcb_STATUS HttpProvider::refresh(unsigned /* options */)
 {
     /**
      * We want a grace interval here because we might already be fetching a

src/bucketconfig/bc_http.h

@@ -63,7 +63,7 @@ struct HttpProvider : Provider {
 
     /* Overrides */
     bool pause() override;
-    lcb_STATUS refresh() override;
+    lcb_STATUS refresh(unsigned options = 0) override;
     ConfigInfo *get_cached() override;
     void config_updated(lcbvb_CONFIG *) override;
     void configure_nodes(const lcb::Hostlist &) override;

src/bucketconfig/bc_static.cc

@@ -49,8 +49,9 @@ class StaticProvider : public Provider
         return config;
     }
 
-    lcb_STATUS refresh() override
+    lcb_STATUS refresh(unsigned options = 0) override
     {
+        (void)options;
         async.signal();
         return LCB_SUCCESS;
     }

src/bucketconfig/clconfig.h

@@ -239,7 +239,7 @@ struct Confmon {
      * @see #stop()
      * @see #is_refreshing()
      */
-    void start(bool refresh = false);
+    void start(unsigned options = 0);
 
     /**
      * @brief Cancel a pending configuration refresh.
@@ -450,7 +450,7 @@ struct Provider {
      * should implement a timeout mechanism of its choice to promptly deliver
      * a success or failure.
      */
-    virtual lcb_STATUS refresh() = 0;
+    virtual lcb_STATUS refresh(unsigned options = 0) = 0;
 
     /**
      * Callback invoked to the provider to indicate that it should cease

src/bucketconfig/confmon.cc

@@ -306,7 +306,7 @@ void Confmon::do_next_provider()
     cur_provider->refresh();
 }
 
-void Confmon::start(bool refresh)
+void Confmon::start(unsigned options)
 {
     lcb_U32 tmonext = 0;
     as_stop.cancel();
@@ -325,10 +325,10 @@ void Confmon::start(bool refresh)
         }
     }
 
-    if (refresh) {
+    if (options) {
         lcb_log(LOGARGS(this, TRACE), "Refreshing current cluster map (bucket: \"%s\"), next update in %dus",
                 settings->bucket, tmonext);
-        cur_provider->refresh();
+        cur_provider->refresh(options);
     }
     as_start.rearm(tmonext);
 }