From b357d3da2a808adfe5920bb2491105cd1a110117 Mon Sep 17 00:00:00 2001
From: Shungang Li <sgli@taosdata.com>
Date: Thu, 29 Aug 2024 14:47:03 +0800
Subject: [PATCH] enh: (s3) continue to check other s3 cfg after an error
 occurs

---
 source/common/src/cos.c | 55 ++++++++++++++++++++++++++++++-----------
 1 file changed, 40 insertions(+), 15 deletions(-)

diff --git a/source/common/src/cos.c b/source/common/src/cos.c
index 3b5fca0fea..250a4815f4 100644
--- a/source/common/src/cos.c
+++ b/source/common/src/cos.c
@@ -72,23 +72,42 @@ void s3CleanUp() { /*s3End();*/
 
 static int32_t s3ListBucket(char const *bucketname);
 
+static void s3DumpCfgByEp(int8_t epIndex) {
+  // clang-format off
+  (void)fprintf(stdout,
+                "%-24s %s\n"
+                "%-24s %s\n"
+                "%-24s %s\n"
+                "%-24s %s\n"
+                "%-24s %s\n"
+                "%-24s %s\n",
+                "hostName", tsS3Hostname[epIndex],
+                "bucketName", tsS3BucketName,
+                "protocol", (protocolG[epIndex] == S3ProtocolHTTPS ? "https" : "http"),
+                "uristyle", (uriStyleG[epIndex] == S3UriStyleVirtualHost ? "virtualhost" : "path"),
+                "accessKey", tsS3AccessKeyId[epIndex],
+                "accessKeySecret", tsS3AccessKeySecret[epIndex]);
+  // clang-format on
+}
+
 int32_t s3CheckCfg() {
   int32_t code = 0, lino = 0;
   int8_t  i = 0;
 
   if (!tsS3Enabled) {
     (void)fprintf(stderr, "s3 not configured.\n");
-    goto _exit;
+    TAOS_RETURN(code);
   }
 
   code = s3Begin();
   if (code != 0) {
     (void)fprintf(stderr, "failed to initialize s3.\n");
-    TAOS_CHECK_GOTO(code, &lino, _exit);
+    TAOS_RETURN(code);
   }
 
   for (; i < tsS3EpNum; i++) {
-    (void)fprintf(stdout, "test s3 ep: %d/%d.\n", i + 1, tsS3EpNum);
+    (void)fprintf(stdout, "test s3 ep (%d/%d):\n", i + 1, tsS3EpNum);
+    s3DumpCfgByEp(i);
 
     // test put
     char        testdata[17] = "0123456789abcdef";
@@ -109,15 +128,15 @@ int32_t s3CheckCfg() {
     if (!fp) {
       (void)fprintf(stderr, "failed to open test file: %s.\n", path);
       // uError("ERROR: %s Failed to open %s", __func__, path);
-      TAOS_CHECK_GOTO(TAOS_SYSTEM_ERROR(errno), &lino, _exit);
+      TAOS_CHECK_GOTO(TAOS_SYSTEM_ERROR(errno), &lino, _next);
     }
     if (taosWriteFile(fp, testdata, strlen(testdata)) < 0) {
       (void)fprintf(stderr, "failed to write test file: %s.\n", path);
-      TAOS_CHECK_GOTO(TAOS_SYSTEM_ERROR(errno), &lino, _exit);
+      TAOS_CHECK_GOTO(TAOS_SYSTEM_ERROR(errno), &lino, _next);
     }
     if (taosFsyncFile(fp) < 0) {
       (void)fprintf(stderr, "failed to fsync test file: %s.\n", path);
-      TAOS_CHECK_GOTO(TAOS_SYSTEM_ERROR(errno), &lino, _exit);
+      TAOS_CHECK_GOTO(TAOS_SYSTEM_ERROR(errno), &lino, _next);
     }
     (void)taosCloseFile(&fp);
 
@@ -125,7 +144,7 @@ int32_t s3CheckCfg() {
     code = s3PutObjectFromFileOffsetByEp(path, objectname[0], 0, 16, i);
     if (code != 0) {
       (void)fprintf(stderr, "put object %s : failed.\n", objectname[0]);
-      TAOS_CHECK_GOTO(code, &lino, _exit);
+      TAOS_CHECK_GOTO(code, &lino, _next);
     }
     (void)fprintf(stderr, "put object %s: success.\n\n", objectname[0]);
 
@@ -134,7 +153,7 @@ int32_t s3CheckCfg() {
     code = s3ListBucketByEp(tsS3BucketName, i);
     if (code != 0) {
       (void)fprintf(stderr, "listing bucket %s : failed.\n", tsS3BucketName);
-      TAOS_CHECK_GOTO(code, &lino, _exit);
+      TAOS_CHECK_GOTO(code, &lino, _next);
     }
     (void)fprintf(stderr, "listing bucket %s: success.\n\n", tsS3BucketName);
 
@@ -147,7 +166,7 @@ int32_t s3CheckCfg() {
     code = s3GetObjectBlockByEp(objectname[0], c_offset, c_len, true, &pBlock, i);
     if (code != 0) {
       (void)fprintf(stderr, "get object %s : failed.\n", objectname[0]);
-      TAOS_CHECK_GOTO(code, &lino, _exit);
+      TAOS_CHECK_GOTO(code, &lino, _next);
     }
     char buf[7] = {0};
     (void)memcpy(buf, pBlock, c_len);
@@ -160,18 +179,24 @@ int32_t s3CheckCfg() {
     code = s3DeleteObjectsByEp(objectname, 1, i);
     if (code != 0) {
       (void)fprintf(stderr, "delete object %s : failed.\n", objectname[0]);
-      TAOS_CHECK_GOTO(code, &lino, _exit);
+      TAOS_CHECK_GOTO(code, &lino, _next);
     }
     (void)fprintf(stderr, "delete object %s: success.\n\n", objectname[0]);
+
+  _next:
+    if (fp) {
+      (void)taosCloseFile(&fp);
+    }
+
+    if (TSDB_CODE_SUCCESS != code) {
+      (void)fprintf(stderr, "s3 check failed, code: %d, line: %d, index: %d.\n", code, lino, i);
+    }
+
+    (void)fprintf(stdout, "=================================================================\n");
   }
 
   s3End();
 
-_exit:
-  if (TSDB_CODE_SUCCESS != code) {
-    (void)fprintf(stderr, "s3 check failed, code: %d, line: %d, index: %d.\n", code, lino, i);
-  }
-
   TAOS_RETURN(code);
 }