separate out app and container history sync.

G-Research · Nov 6, 2024 · b91b2da · b91b2da
1 parent 8912e43
commit b91b2da
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/internal/yunikorn/service.go b/internal/yunikorn/service.go
@@ -88,8 +88,11 @@ func (s *Service) Run(ctx context.Context) error {
 	if err := s.syncNodes(ctx, fullState.Nodes); err != nil {
 		return fmt.Errorf("error syncing nodes: %v", err)
 	}
-	if err := s.syncHistory(ctx, fullState.AppHistory, fullState.ContainerHistory); err != nil {
-		return fmt.Errorf("error syncing app and container history: %v", err)
+	if err := s.syncAppHistory(ctx, fullState.AppHistory); err != nil {
+		return fmt.Errorf("error syncing app history: %v", err)
+	}
+	if err := s.syncContainerHistory(ctx, fullState.ContainerHistory); err != nil {
+		return fmt.Errorf("error syncing container history: %v", err)
 	}
 
 	g.Add(func() error {

diff --git a/internal/yunikorn/sync.go b/internal/yunikorn/sync.go
@@ -187,17 +187,13 @@ func (s *Service) syncApplications(ctx context.Context, applications []*dao.Appl
 	return nil
 }
 
-func (s *Service) syncHistory(
-	ctx context.Context,
-	appsHistory []*dao.ApplicationHistoryDAOInfo,
-	containersHistory []*dao.ContainerHistoryDAOInfo) error {
-
-	now := time.Now().UnixNano()
+func (s *Service) syncAppHistory(ctx context.Context, appsHistory []*dao.ApplicationHistoryDAOInfo) error {
 	var errs []error
+	nowNano := time.Now().UnixNano()
 	for _, ah := range appsHistory {
 		history := &model.AppHistory{
 			Metadata: model.Metadata{
-				CreatedAtNano: now,
+				CreatedAtNano: nowNano,
 			},
 			ID:                        ulid.Make().String(),
 			ApplicationHistoryDAOInfo: *ah,
@@ -206,11 +202,16 @@ func (s *Service) syncHistory(
 			errs = append(errs, fmt.Errorf("could not insert app history: %v", err))
 		}
 	}
+	return errors.Join(errs...)
+}
 
+func (s *Service) syncContainerHistory(ctx context.Context, containersHistory []*dao.ContainerHistoryDAOInfo) error {
+	var errs []error
+	nowNano := time.Now().UnixNano()
 	for _, ch := range containersHistory {
 		history := &model.ContainerHistory{
 			Metadata: model.Metadata{
-				CreatedAtNano: now,
+				CreatedAtNano: nowNano,
 			},
 			ID:                      ulid.Make().String(),
 			ContainerHistoryDAOInfo: *ch,
@@ -219,6 +220,5 @@ func (s *Service) syncHistory(
 			errs = append(errs, fmt.Errorf("could not insert container history: %v", err))
 		}
 	}
-
 	return errors.Join(errs...)
 }