Skip to content

Commit 0f68b11

Browse files
committed
Merge branch 'master' into develop
2 parents b8f3451 + f8494ff commit 0f68b11

9 files changed

+10
-12
lines changed

deps/init/oceanbase.al8.aarch64.deps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ devdeps-rocksdb-6.22.1-32024123015.al8.aarch64.rpm
5555
#obshell-4.3.3.0-12025110521.al8.aarch64.rpm target=community
5656

5757
[test-utils]
58-
ob-deploy-3.6.1-9.al8.aarch64.rpm target=community
58+
ob-deploy-3.6.1-10.al8.aarch64.rpm target=community
5959
obclient-2.2.3-202024102217.al8.aarch64.rpm target=community
6060
libobclient-2.2.3-152024102213.al8.aarch64.rpm target=community

deps/init/oceanbase.al8.x86_64.deps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ obdevtools-obstack-2.0.4-42024101017.al8.x86_64.rpm
5858
#obshell-4.3.3.0-12025110521.al8.x86_64.rpm target=community
5959

6060
[test-utils]
61-
ob-deploy-3.6.1-9.al8.x86_64.rpm target=community
61+
ob-deploy-3.6.1-10.al8.x86_64.rpm target=community
6262
obclient-2.2.3-202024102217.al8.x86_64.rpm target=community
6363
libobclient-2.2.3-152024102213.al8.x86_64.rpm target=community

deps/init/oceanbase.el7.aarch64.deps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ obstack-2.0.4-172024070513.el7.aarch64.rpm
5555
#obshell-4.3.3.0-12025110521.el7.aarch64.rpm target=community
5656

5757
[test-utils]
58-
ob-deploy-3.6.1-9.el7.aarch64.rpm target=community
58+
ob-deploy-3.6.1-10.el7.aarch64.rpm target=community
5959
obclient-2.2.2-1.el7.aarch64.rpm target=community
6060
libobclient-2.2.2-3.el7.aarch64.rpm target=community

deps/init/oceanbase.el7.x86_64.deps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ obstack-2.0.4-172024070513.el7.x86_64.rpm
5959
#obshell-4.3.3.0-12025110521.el7.x86_64.rpm target=community
6060

6161
[test-utils]
62-
ob-deploy-3.6.1-9.el7.x86_64.rpm target=community
62+
ob-deploy-3.6.1-10.el7.x86_64.rpm target=community
6363
obclient-2.2.2-1.el7.x86_64.rpm target=community
6464
libobclient-2.2.2-3.el7.x86_64.rpm target=community

deps/init/oceanbase.el8.aarch64.deps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ obstack-2.0.4-172024070513.el8.aarch64.rpm
5555
#obshell-4.3.3.0-12025110521.el8.aarch64.rpm target=community
5656

5757
[test-utils]
58-
ob-deploy-3.6.1-9.el8.aarch64.rpm target=community
58+
ob-deploy-3.6.1-10.el8.aarch64.rpm target=community
5959
obclient-2.2.2-1.el8.aarch64.rpm target=community
6060
libobclient-2.2.2-3.el8.aarch64.rpm target=community

deps/init/oceanbase.el8.x86_64.deps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ obstack-2.0.4-172024070513.el8.x86_64.rpm
5858
#obshell-4.3.3.0-12025110521.el8.x86_64.rpm target=community
5959

6060
[test-utils]
61-
ob-deploy-3.6.1-9.el8.x86_64.rpm target=community
61+
ob-deploy-3.6.1-10.el8.x86_64.rpm target=community
6262
obclient-2.2.2-1.el8.x86_64.rpm target=community
6363
libobclient-2.2.2-3.el8.x86_64.rpm target=community

deps/init/oceanbase.el9.aarch64.deps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ obclient-2.2.2-1.el8.aarch64.rpm target=community
6767
libobclient-2.2.2-3.el8.aarch64.rpm target=community
6868

6969
[test-utils]
70-
ob-deploy-3.6.1-9.el8.aarch64.rpm target=community
70+
ob-deploy-3.6.1-10.el8.aarch64.rpm target=community
7171
obclient-2.2.2-1.el8.aarch64.rpm target=community
7272
libobclient-2.2.2-3.el8.aarch64.rpm target=community

deps/init/oceanbase.el9.x86_64.deps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,6 @@ obstack-2.0.4-172024070513.el8.x86_64.rpm
6565
#obshell-4.3.3.0-12025110521.el8.x86_64.rpm target=community
6666

6767
[test-utils]
68-
ob-deploy-3.6.1-9.el8.x86_64.rpm target=community
68+
ob-deploy-3.6.1-10.el8.x86_64.rpm target=community
6969
obclient-2.2.2-1.el8.x86_64.rpm target=community
7070
libobclient-2.2.2-3.el8.x86_64.rpm target=community

tools/deploy/obd/observer.include.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ config:
66
# datafile_disk_percentage: '50'
77
datafile_size: '2G'
88
datafile_next: '2G'
9-
datafile_maxsize: '8G'
9+
datafile_maxsize: '50G'
1010
# log_disk_percentage: '10'
11-
log_disk_size: '21G'
11+
log_disk_size: '10G'
1212
memory_limit: '2G'
1313
system_memory: '1G'
1414
cpu_count: '8'
15-
cache_wash_threshold: '1G'
1615
workers_per_cpu_quota: '10'
1716
schema_history_expire_time: '1d'
1817
net_thread_count: '4'
19-
syslog_io_bandwidth_limit: '10G'

0 commit comments

Comments
 (0)