From 54e7e450744e6fd919a013bf21cdb1fc1347f9c3 Mon Sep 17 00:00:00 2001 From: Wesley Wang Date: Thu, 21 Oct 2021 16:15:14 +0800 Subject: [PATCH] BugFixs: 1. Use the new prometheus package to fix the core problem Other: 1. update version to 3.2.0 2. Open source opens the 2.0 protocol by default --- build.sh | 2 +- deps/3rd/obproxy.el7.x86_64.deps | 2 +- deps/3rd/obproxy.el8.x86_64.deps | 2 +- src/obproxy/obutils/ob_proxy_config.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 92ae3cf..394ea3c 100755 --- a/build.sh +++ b/build.sh @@ -91,7 +91,7 @@ function do_rpm() set -x sw PACKAGE=obproxy - VERSION=3.1.0 + VERSION=3.2.0 RELEASE=1 PREFIX=/home/admin/obproxy SPEC_FILE=obproxy.spec diff --git a/deps/3rd/obproxy.el7.x86_64.deps b/deps/3rd/obproxy.el7.x86_64.deps index a1dc92c..5ebd3a4 100644 --- a/deps/3rd/obproxy.el7.x86_64.deps +++ b/deps/3rd/obproxy.el7.x86_64.deps @@ -6,7 +6,7 @@ repo=https://mirrors.aliyun.com/oceanbase/development-kit/el/7/x86_64/ devdeps-openssl-static-1.0.1e-3.el7.x86_64.rpm devdeps-libcurl-static-7.29.0-3.el7.x86_64.rpm devdeps-mariadb-connector-c-3.1.12-3.el7.x86_64.rpm -devdeps-prometheus-cpp-0.8.0-3.el7.x86_64.rpm +devdeps-prometheus-cpp-0.8.0-4.el7.x86_64.rpm devdeps-gtest-1.8.0-3.el7.x86_64.rpm devdeps-grpc-1.20.1-3.el7.x86_64.rpm diff --git a/deps/3rd/obproxy.el8.x86_64.deps b/deps/3rd/obproxy.el8.x86_64.deps index 0bea433..358b6bc 100644 --- a/deps/3rd/obproxy.el8.x86_64.deps +++ b/deps/3rd/obproxy.el8.x86_64.deps @@ -6,7 +6,7 @@ repo=https://mirrors.aliyun.com/oceanbase/development-kit/el/8/x86_64/ devdeps-openssl-static-1.0.1e-3.el8.x86_64.rpm devdeps-libcurl-static-7.29.0-3.el8.x86_64.rpm devdeps-mariadb-connector-c-3.1.12-3.el8.x86_64.rpm -devdeps-prometheus-cpp-0.8.0-3.el8.x86_64.rpm +devdeps-prometheus-cpp-0.8.0-4.el8.x86_64.rpm devdeps-gtest-1.8.0-3.el8.x86_64.rpm devdeps-grpc-1.20.1-3.el8.x86_64.rpm diff --git a/src/obproxy/obutils/ob_proxy_config.h b/src/obproxy/obutils/ob_proxy_config.h index d30f4a8..a0b41b8 100644 --- a/src/obproxy/obutils/ob_proxy_config.h +++ b/src/obproxy/obutils/ob_proxy_config.h @@ -283,7 +283,7 @@ public: DEF_BOOL(enable_bad_route_reject, "false", "if enabled, bad route request will be rejected, e.g. first statement of transaction opened by BEGIN(or START TRANSACTION) without table name", CFG_NO_NEED_REBOOT, CFG_SECTION_OBPROXY, CFG_VISIBLE_LEVEL_USER); DEF_BOOL(enable_partition_table_route, "true", "if enabled, partition table will be accurate routing", CFG_NO_NEED_REBOOT, CFG_SECTION_OBPROXY, CFG_VISIBLE_LEVEL_USER); DEF_BOOL(enable_compression_protocol, "true", "if enabled, proxy will use compression protocol with server", CFG_NO_NEED_REBOOT, CFG_SECTION_OBPROXY, CFG_VISIBLE_LEVEL_USER); - DEF_BOOL(enable_ob_protocol_v2, "false", "if enabled, proxy will use oceanbase protocol 2.0 with server", CFG_NO_NEED_REBOOT, CFG_SECTION_OBPROXY, CFG_VISIBLE_LEVEL_USER); + DEF_BOOL(enable_ob_protocol_v2, "true", "if enabled, proxy will use oceanbase protocol 2.0 with server", CFG_NO_NEED_REBOOT, CFG_SECTION_OBPROXY, CFG_VISIBLE_LEVEL_USER); DEF_BOOL(enable_reroute, "false", "if this and protocol_v2 enabled, proxy will reroute when routing error", CFG_NO_NEED_REBOOT, CFG_SECTION_OBPROXY, CFG_VISIBLE_LEVEL_USER); DEF_BOOL(enable_pl_route, "true", "if enabled, pl will be accurate routing", CFG_NO_NEED_REBOOT, CFG_SECTION_OBPROXY, CFG_VISIBLE_LEVEL_USER); -- GitLab