add background migration

BeryJu · Nov 25, 2024 · 17f6cdb · 17f6cdb
1 parent bc62216
commit 17f6cdb
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 22 deletions.
diff --git a/pkg/instance/api_instance.go b/pkg/instance/api_instance.go
@@ -73,13 +73,7 @@ type APIInstanceInfo struct {
 
 func (i *Instance) APIInstanceInfo() usecase.Interactor {
 	u := usecase.NewInteractor(func(ctx context.Context, input struct{}, output *APIInstanceInfo) error {
-		ri := i.ForRole("api", ctx)
-		m := migrate.New(ri)
-		cv, err := m.GetClusterVersion(ctx)
-		if err != nil {
-			return status.Internal
-		}
-		output.Version = cv.String()
+		output.Version = extconfig.Version
 		output.BuildHash = extconfig.BuildHash
 		output.Dirs = extconfig.Get().Dirs()
 		output.CurrentInstanceIP = extconfig.Get().Instance.IP

diff --git a/pkg/roles/dhcp/role_migrations.go b/pkg/roles/dhcp/role_migrations.go
@@ -41,21 +41,38 @@ func (r *Role) migrateMoveInitial(ctx context.Context) {
 	}
 }
 
-// func (r *Role) migrateMoveBackground() {
-// 	watchChan := r.i.KV().Watch(
-// 		r.ctx,
-// 		r.i.KV().Key(types.KeyRole, types.KeyLegacyLeases).Prefix(true).String(),
-// 		clientv3.WithPrefix(),
-// 	)
-// 	for watchResp := range watchChan {
-// 		for _, event := range watchResp.Events {
-// 			switch event.Type {
-// 			case clientv3.EventTypeDelete:
-// 				r.i.KV().Delete(r.ctx)
-// 			}
-// 		}
-// 	}
-// }
+func (r *Role) migrateMoveBackground(ctx context.Context) {
+	watchChan := r.i.KV().Watch(
+		ctx,
+		r.i.KV().Key(types.KeyRole, types.KeyLegacyLeases).Prefix(true).String(),
+		clientv3.WithPrefix(),
+	)
+	type partialLease struct {
+		ScopeKey string `json:"scopeKey"`
+	}
+	for watchResp := range watchChan {
+		for _, event := range watchResp.Events {
+			pl := partialLease{}
+			err := json.Unmarshal(event.Kv.Value, &pl)
+			if err != nil {
+				r.log.Warn("failed to parse partial lease", zap.Error(err))
+				continue
+			}
+			ident := strings.Split(string(event.Kv.Key), "/")[2]
+			newKey := r.i.KV().Key(types.KeyRole, types.KeyScopes, pl.ScopeKey, ident).String()
+			switch event.Type {
+			case clientv3.EventTypePut:
+				_, err = r.i.KV().Put(ctx, newKey, string(event.Kv.Value))
+			case clientv3.EventTypeDelete:
+				_, err = r.i.KV().Delete(ctx, newKey)
+			}
+			if err != nil {
+				r.log.Warn("failed to mirror legacy lease operation", zap.Error(err))
+				continue
+			}
+		}
+	}
+}
 
 func (r *Role) RegisterMigrations() {
 	r.i.Migrator().AddMigration(&migrate.InlineMigration{
@@ -76,6 +93,7 @@ func (r *Role) RegisterMigrations() {
 			leasePrefix := r.i.KV().Key(types.KeyRole, types.KeyScopes).Prefix(true).String()
 
 			r.migrateMoveInitial(ctx)
+			go r.migrateMoveBackground(ctx)
 
 			return r.i.KV().WithHooks(storage.StorageHook{
 				PutPost: func(ctx context.Context, key, val string, res *clientv3.PutResponse, opts ...clientv3.OpOption) (*clientv3.PutResponse, error) {