From bd758e0269786711de840303a921b93b4e097d2c Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Tue, 15 Aug 2023 15:14:34 +0800
Subject: [PATCH] retention: remove old files last

---
 source/dnode/vnode/src/inc/vndCos.h         |  2 +-
 source/dnode/vnode/src/tsdb/tsdbRetention.c | 23 +++++++++++----------
 source/dnode/vnode/src/vnd/vnodeCos.c       | 11 ++++++++--
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/source/dnode/vnode/src/inc/vndCos.h b/source/dnode/vnode/src/inc/vndCos.h
index f6db7f096e..cf2c5eb441 100644
--- a/source/dnode/vnode/src/inc/vndCos.h
+++ b/source/dnode/vnode/src/inc/vndCos.h
@@ -26,7 +26,7 @@ extern int8_t tsS3Enabled;
 
 int32_t s3Init();
 void    s3CleanUp();
-void    s3PutObjectFromFile(const char *file, const char *object);
+int32_t s3PutObjectFromFile(const char *file, const char *object);
 void    s3DeleteObjects(const char *object_name[], int nobject);
 bool    s3Exists(const char *object_name);
 bool    s3Get(const char *object_name, const char *path);
diff --git a/source/dnode/vnode/src/tsdb/tsdbRetention.c b/source/dnode/vnode/src/tsdb/tsdbRetention.c
index ebe20c0e85..46a5d19a1a 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRetention.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRetention.c
@@ -114,7 +114,8 @@ static int32_t tsdbCopyFileS3(SRTNer *rtner, const STFileObj *from, const STFile
   TSDB_CHECK_CODE(code, lino, _exit);
 
   char *object_name = taosDirEntryBaseName(fname);
-  s3PutObjectFromFile(from->fname, object_name);
+  code = s3PutObjectFromFile(from->fname, object_name);
+  TSDB_CHECK_CODE(code, lino, _exit);
 
   taosCloseFile(&fdFrom);
 
@@ -178,16 +179,6 @@ static int32_t tsdbMigrateDataFileS3(SRTNer *rtner, const STFileObj *fobj, const
   int32_t  lino = 0;
   STFileOp op = {0};
 
-  // remove old
-  op = (STFileOp){
-      .optype = TSDB_FOP_REMOVE,
-      .fid = fobj->f->fid,
-      .of = fobj->f[0],
-  };
-
-  code = TARRAY2_APPEND(rtner->fopArr, op);
-  TSDB_CHECK_CODE(code, lino, _exit);
-
   // create new
   op = (STFileOp){
       .optype = TSDB_FOP_CREATE,
@@ -213,6 +204,16 @@ static int32_t tsdbMigrateDataFileS3(SRTNer *rtner, const STFileObj *fobj, const
   code = tsdbCopyFileS3(rtner, fobj, &op.nf);
   TSDB_CHECK_CODE(code, lino, _exit);
 
+  // remove old
+  op = (STFileOp){
+      .optype = TSDB_FOP_REMOVE,
+      .fid = fobj->f->fid,
+      .of = fobj->f[0],
+  };
+
+  code = TARRAY2_APPEND(rtner->fopArr, op);
+  TSDB_CHECK_CODE(code, lino, _exit);
+
 _exit:
   if (code) {
     TSDB_ERROR_LOG(TD_VID(rtner->tsdb->pVnode), lino, code);
diff --git a/source/dnode/vnode/src/vnd/vnodeCos.c b/source/dnode/vnode/src/vnd/vnodeCos.c
index b28b7ad747..02021831bf 100644
--- a/source/dnode/vnode/src/vnd/vnodeCos.c
+++ b/source/dnode/vnode/src/vnd/vnodeCos.c
@@ -51,7 +51,8 @@ static void s3InitRequestOptions(cos_request_options_t *options, int is_cname) {
   options->ctl = cos_http_controller_create(options->pool, 0);
 }
 
-void s3PutObjectFromFile(const char *file_str, const char *object_str) {
+int32_t s3PutObjectFromFile(const char *file_str, const char *object_str) {
+  int32_t                code = 0;
   cos_pool_t            *p = NULL;
   int                    is_cname = 0;
   cos_status_t          *s = NULL;
@@ -76,6 +77,12 @@ void s3PutObjectFromFile(const char *file_str, const char *object_str) {
   log_status(s);
 
   cos_pool_destroy(p);
+
+  if (s->code != 200) {
+    return code = s->code;
+  }
+
+  return code;
 }
 
 void s3DeleteObjects(const char *object_name[], int nobject) {
@@ -300,7 +307,7 @@ long s3Size(const char *object_name) {
 
 int32_t s3Init() { return 0; }
 void    s3CleanUp() {}
-void    s3PutObjectFromFile(const char *file, const char *object) {}
+int32_t s3PutObjectFromFile(const char *file, const char *object) { return 0; }
 void    s3DeleteObjects(const char *object_name[], int nobject) {}
 bool    s3Exists(const char *object_name) { return false; }
 bool    s3Get(const char *object_name, const char *path) { return false; }