Neeraj Gupta 1 năm trước cách đây
mục cha
commit
3f1ee82ec5

+ 1 - 1
server/pkg/controller/embedding/controller.go

@@ -348,7 +348,7 @@ func (c *Controller) getEmbeddingObject(ctx context.Context, objectKey string, d
 				// check if the error is due to object not found
 				// check if the error is due to object not found
 				if s3Err, ok := err.(awserr.RequestFailure); ok {
 				if s3Err, ok := err.(awserr.RequestFailure); ok {
 					if s3Err.Code() == s3.ErrCodeNoSuchKey {
 					if s3Err.Code() == s3.ErrCodeNoSuchKey {
-						if c.areDerivedAndHotBucketSame {
+						if c.derivedStorageDataCenter == c.S3Config.GetHotDataCenter() {
 							ctxLogger.Error("Object not found: ", s3Err)
 							ctxLogger.Error("Object not found: ", s3Err)
 						} else {
 						} else {
 							// If derived and hot bucket are different, try to copy from hot bucket
 							// If derived and hot bucket are different, try to copy from hot bucket

+ 2 - 2
server/pkg/controller/embedding/delete.go

@@ -81,8 +81,8 @@ func (c *Controller) deleteEmbedding(qItem repo.QueueItem) {
 			ctxLogger.WithError(err).Error("Failed to delete all objects")
 			ctxLogger.WithError(err).Error("Failed to delete all objects")
 			return
 			return
 		}
 		}
-		// if Embeddings DC is different from hot DC, delete from hot DC as well
-		if !c.areDerivedAndHotBucketSame {
+		// if Derived DC is different from hot DC, delete from hot DC as well
+		if c.derivedStorageDataCenter != c.S3Config.GetHotDataCenter() {
 			err = c.ObjectCleanupController.DeleteAllObjectsWithPrefix(prefix, c.S3Config.GetHotDataCenter())
 			err = c.ObjectCleanupController.DeleteAllObjectsWithPrefix(prefix, c.S3Config.GetHotDataCenter())
 			if err != nil {
 			if err != nil {
 				ctxLogger.WithError(err).Error("Failed to delete all objects from hot DC")
 				ctxLogger.WithError(err).Error("Failed to delete all objects from hot DC")