Minor changes

Author: Gleez Technologies

river/river.go

@@ -190,32 +190,20 @@ func (r *River) run() error {
 		r.sphinxService.WaitUntilStarted()
 	}
 
+	err = r.sphinxService.LoadSyncState(r.master.syncState())
+	if err != nil {
+		r.l.Errorf("one or more manticore backends are not up to date: %v", err)
+		return errors.Trace(err)
+	}
+
 	b := &backoff.Backoff{
 		Min:    1 * time.Second,
-		Max:    10 * time.Minute,
+		Max:    5 * time.Minute,
 		Factor: 2,
 		Jitter: true,
 	}
 	defer b.Reset()
 
-	// // get master state - wait until get state or timeout
-	// for {
-	// 	time.Sleep(b.Duration())
-
-	// 	err = r.sphinxService.LoadSyncState(r.master.syncState())
-	// 	if err == nil {
-	// 		b.Reset()
-	// 		r.l.Infof("Connected to manticore backend")
-	// 		break
-	// 	}
-	// }
-
-	err = r.sphinxService.LoadSyncState(r.master.syncState())
-	if err != nil {
-		r.l.Errorf("one or more manticore backends are not up to date: %v", err)
-		return errors.Trace(err)
-	}
-
 	// check indexes are ready - wait until ready or timeout
 	for {
 		time.Sleep(b.Duration())

river/status.go

@@ -311,6 +311,7 @@ func handleStartSync(r *River) http.HandlerFunc {
 
 		r.l.Infof("reset GTID after successful restart to: %s", r.master.gtidSet())
 		r.startSyncRoutine()
+
 		w.WriteHeader(http.StatusNoContent)
 	})
 }