From b78489d2a6ae85506f9f8b68520840969b77ba16 Mon Sep 17 00:00:00 2001
From: obdev <obdev@oceanbase.com>
Date: Fri, 26 Aug 2022 11:17:18 +0800
Subject: [PATCH] [Github PR] support modify clog size with parameters

---
 src/clog/ob_log_file_pool.cpp                             | 8 ++++----
 src/share/config/ob_config_helper.cpp                     | 4 +++-
 .../r/mysql/all_virtual_sys_parameter_stat.result         | 1 +
 tools/deploy/obd/observer.include.yaml                    | 1 -
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/clog/ob_log_file_pool.cpp b/src/clog/ob_log_file_pool.cpp
index 58eec5e743..4f9bec6133 100755
--- a/src/clog/ob_log_file_pool.cpp
+++ b/src/clog/ob_log_file_pool.cpp
@@ -426,7 +426,7 @@ int ObLogWriteFilePool::update_free_quota(const char* path, const int64_t percen
   } else if (OB_FAIL(get_total_used_size(used_size))) {
     ret = OB_IO_ERROR;  
     COMMON_LOG(ERROR, "get_total_used_size fail", K(ret));
-  } else if(OB_FAIL(calculate_free_quota(path, used_size, percent, limit_percent))){
+  } else if (OB_FAIL(calculate_free_quota(path, used_size, percent, limit_percent))){
     ret = OB_IO_ERROR;
     CLOG_LOG(ERROR, "calculate free quota error", K(ret), K(path), K(errno), KERRMSG);
   } 
@@ -457,10 +457,10 @@ int ObLogWriteFilePool::calculate_free_quota(const char* path, const int64_t use
   if (OB_UNLIKELY(0 != statvfs(path, &svfs))) {
     ret = OB_IO_ERROR;
     CLOG_LOG(ERROR, "statvfs error", K(ret), K(path), K(errno), KERRMSG);
-  } else{
-    if (log_disk_size != 0){
+  } else {
+    if (log_disk_size != 0) {
       total_size = log_disk_size;
-    }else{
+    } else {
       total_size = (int64_t)svfs.f_bsize * (int64_t)svfs.f_blocks;
     }
     
diff --git a/src/share/config/ob_config_helper.cpp b/src/share/config/ob_config_helper.cpp
index b1e74809c7..a9ee11307d 100755
--- a/src/share/config/ob_config_helper.cpp
+++ b/src/share/config/ob_config_helper.cpp
@@ -492,7 +492,9 @@ bool ObConfigLogDiskSizeChecker::check(const ObConfigItem& t) const
       const int64_t total_disk_size = (int64_t)svfs.f_bsize * (int64_t)svfs.f_blocks;
       is_valid = (log_disk_size <= total_disk_size);
       if (!is_valid) {
-        OB_LOG(ERROR,"log_disk_size is greater than total disk size.", K(log_disk_size), K(total_disk_size));
+        OB_LOG(ERROR,"log_disk_size is greater than total disk size.", 
+          K(log_disk_size), 
+          K(total_disk_size));
       }
     }
   }
diff --git a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/all_virtual_sys_parameter_stat.result b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/all_virtual_sys_parameter_stat.result
index c6d0d03637..ca220f9a46 100644
--- a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/all_virtual_sys_parameter_stat.result
+++ b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/all_virtual_sys_parameter_stat.result
@@ -151,6 +151,7 @@ location_refresh_thread_count
 log_archive_batch_buffer_limit
 log_archive_checkpoint_interval
 log_archive_concurrency
+log_disk_size
 log_restore_concurrency
 major_compact_trigger
 major_freeze_duty_time
diff --git a/tools/deploy/obd/observer.include.yaml b/tools/deploy/obd/observer.include.yaml
index c07aa86b9a..3da86b2b9a 100644
--- a/tools/deploy/obd/observer.include.yaml
+++ b/tools/deploy/obd/observer.include.yaml
@@ -33,4 +33,3 @@ config:
   enable_merge_by_turn: 'FALSE'
   syslog_io_bandwidth_limit: '10G'
   enable_async_syslog: 'FALSE'
-  log_disk_size: '30G'
-- 
GitLab