Merge pull request #21 from threefoldtech/main-sync-zos3

sync with zos3

Author: ashraffouda

cmds/modules/provisiond/main.go

@@ -91,7 +91,7 @@ func integrityChecks(ctx context.Context, rootDir string) error {
 // runChecks starts provisiond with the special flag `--integrity` which runs some
 // checks and return an error if checks did not pass.
 // if an error is received the db files are cleaned
-func runChecks(ctx context.Context, rootDir string) error {
+func runChecks(ctx context.Context, rootDir string, cl zbus.Client) error {
 	log.Info().Msg("run integrity checks")
 	ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
 	defer cancel()
@@ -110,6 +110,13 @@ func runChecks(ctx context.Context, rootDir string) error {
 
 	log.Error().Str("stderr", buf.String()).Err(err).Msg("integrity check failed, resetting rrd db")
 
+	zui := stubs.NewZUIStub(cl)
+	if er := zui.PushErrors(ctx, "integrity", []string{
+		fmt.Sprintf("integrity check failed, resetting rrd db stderr=%s: %v", buf.String(), err),
+	}); er != nil {
+		log.Error().Err(er).Msg("failed to push errors to zui")
+	}
+
 	// other error, we can try to clean up and continue
 	return os.RemoveAll(filepath.Join(rootDir, metricsStorageDB))
 }
@@ -121,6 +128,14 @@ func action(cli *cli.Context) error {
 		integrity    bool   = cli.Bool("integrity")
 	)
 
+	server, err := zbus.NewRedisServer(serverName, msgBrokerCon, 1)
+	if err != nil {
+		return errors.Wrap(err, "failed to connect to message broker")
+	}
+	cl, err := zbus.NewRedisClient(msgBrokerCon)
+	if err != nil {
+		return errors.Wrap(err, "fail to connect to message broker server")
+	}
 	ctx, _ := utils.WithSignal(context.Background())
 
 	if integrity {
@@ -132,7 +147,7 @@ func action(cli *cli.Context) error {
 	})
 
 	// run integrityChecks
-	if err := runChecks(ctx, rootDir); err != nil {
+	if err := runChecks(ctx, rootDir, cl); err != nil {
 		return errors.Wrap(err, "error running integrity checks")
 	}
 
@@ -160,15 +175,6 @@ func action(cli *cli.Context) error {
 		select {}
 	}
 
-	server, err := zbus.NewRedisServer(serverName, msgBrokerCon, 1)
-	if err != nil {
-		return errors.Wrap(err, "failed to connect to message broker")
-	}
-	cl, err := zbus.NewRedisClient(msgBrokerCon)
-	if err != nil {
-		return errors.Wrap(err, "fail to connect to message broker server")
-	}
-
 	identity := stubs.NewIdentityManagerStub(cl)
 	sk := ed25519.PrivateKey(identity.PrivateKey(ctx))
 

pkg/registrar/registrar.go

@@ -23,7 +23,8 @@ const (
 	InProgress RegistrationState = "InProgress"
 	Done       RegistrationState = "Done"
 
-	monitorAccountEvery = 30 * time.Minute
+	monitorAccountEvery    = 30 * time.Minute
+	updateNodeInfoInterval = 24 * time.Hour
 )
 
 var (
@@ -146,6 +147,9 @@ func (r *Registrar) register(ctx context.Context, cl zbus.Client, env environmen
 			if err := r.reActivate(ctx, cl, env); err != nil {
 				log.Error().Err(err).Msg("failed to reactivate account")
 			}
+		case <-time.After(updateNodeInfoInterval):
+			log.Info().Msg("update interval passed, re-register")
+			register()
 		case <-addressesUpdate:
 			log.Info().Msg("zos address has changed, re-register")
 			register()