Skip to content

Commit 1cf30a7

Browse files
whhewhhe
committed
release v4.2.3
1 parent d68e69b commit 1cf30a7

16 files changed

+1759
-19
lines changed

‎CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ add_library(binlog_instance_static STATIC
319319
${CMAKE_CURRENT_SOURCE_DIR}/src/binlog/binlog-instance/table_cache.cpp
320320
${CMAKE_CURRENT_SOURCE_DIR}/src/binlog/binlog_index.cpp
321321
${CMAKE_CURRENT_SOURCE_DIR}/src/binlog/ob_log_event.cpp
322+
${CMAKE_CURRENT_SOURCE_DIR}/src/binlog/binlog_dtoa.cpp
322323
${CMAKE_CURRENT_SOURCE_DIR}/src/binlog/data_type.cpp
323324
${CMAKE_CURRENT_SOURCE_DIR}/src/binlog/connection.cpp
324325
${CMAKE_CURRENT_SOURCE_DIR}/src/binlog/env.cpp
@@ -341,6 +342,7 @@ add_library(binlog_instance_static STATIC
341342
${CMAKE_CURRENT_SOURCE_DIR}/src/binlog/binlog-instance/parallel_convert.h
342343
src/binlog/release_event_helper.cpp
343344
src/binlog/release_event_helper.h)
345+
target_compile_options(binlog_instance_static PRIVATE -Wno-register)
344346
target_include_directories(binlog_instance_static
345347
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src/binlog
346348
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src/binlog/binlog-instance)
@@ -371,6 +373,7 @@ add_library(binlog_manager_static STATIC
371373
${CMAKE_CURRENT_SOURCE_DIR}/src/binlog/sql_parser.cpp
372374
${CMAKE_CURRENT_SOURCE_DIR}/src/binlog/binlog_index.cpp
373375
${CMAKE_CURRENT_SOURCE_DIR}/src/binlog/ob_log_event.cpp
376+
${CMAKE_CURRENT_SOURCE_DIR}/src/binlog/binlog_dtoa.cpp
374377
${CMAKE_CURRENT_SOURCE_DIR}/src/binlog/data_type.cpp
375378
${CMAKE_CURRENT_SOURCE_DIR}/src/binlog/gtid_manager.cpp
376379
${CMAKE_CURRENT_SOURCE_DIR}/src/binlog/selection_strategy.cpp
@@ -382,6 +385,7 @@ add_library(binlog_manager_static STATIC
382385
target_include_directories(binlog_manager_static
383386
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src/binlog
384387
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src/binlog/binlog-instance)
388+
target_compile_options(binlog_manager_static PRIVATE -Wno-register)
385389
target_link_libraries(binlog_manager_static
386390
PRIVATE mysql_protocol
387391
PRIVATE common

‎deps/oblogproxy.el7.aarch64.deps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ oceanbase-ce-cdc-4.2.1.10-110000022024112010.el7.aarch64.rpm
1111
oceanbase-ce-cdc-4.2.2.1-101000022024031310.el7.aarch64.rpm
1212
oceanbase-ce-cdc-4.2.3.1-101000012024061810.el7.aarch64.rpm
1313
oceanbase-ce-cdc-4.2.4.0-100000032024070811.el7.aarch64.rpm
14-
oceanbase-ce-cdc-4.2.5.1-101000042024120918.el7.aarch64.rpm
14+
oceanbase-ce-cdc-4.2.5.2-102000042025012010.el7.aarch64.rpm
1515
oceanbase-ce-cdc-4.3.0.1-101000042024032211.el7.aarch64.rpm
1616
oceanbase-ce-cdc-4.3.1.0-100000082024051609.el7.aarch64.rpm
1717
oceanbase-ce-cdc-4.3.2.1-100000072024081218.el7.aarch64.rpm

‎deps/oblogproxy.el7.x86_64.deps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ oceanbase-ce-cdc-4.2.1.10-110000022024112010.el7.x86_64.rpm
1111
oceanbase-ce-cdc-4.2.2.1-101000022024031310.el7.x86_64.rpm
1212
oceanbase-ce-cdc-4.2.3.1-101000012024061810.el7.x86_64.rpm
1313
oceanbase-ce-cdc-4.2.4.0-100000032024070811.el7.x86_64.rpm
14-
oceanbase-ce-cdc-4.2.5.1-101000042024120918.el7.x86_64.rpm
14+
oceanbase-ce-cdc-4.2.5.2-102000042025012010.el7.x86_64.rpm
1515
oceanbase-ce-cdc-4.3.0.1-101000042024032211.el7.x86_64.rpm
1616
oceanbase-ce-cdc-4.3.1.0-100000082024051609.el7.x86_64.rpm
1717
oceanbase-ce-cdc-4.3.2.1-100000072024081218.el7.x86_64.rpm

‎deps/oblogproxy.el8.aarch64.deps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ oceanbase-ce-cdc-4.2.1.10-110000022024112010.el8.aarch64.rpm
1111
oceanbase-ce-cdc-4.2.2.1-101000022024031310.el8.aarch64.rpm
1212
oceanbase-ce-cdc-4.2.3.1-101000012024061810.el8.aarch64.rpm
1313
oceanbase-ce-cdc-4.2.4.0-100000032024070811.el8.aarch64.rpm
14-
oceanbase-ce-cdc-4.2.5.1-101000042024120918.el8.aarch64.rpm
14+
oceanbase-ce-cdc-4.2.5.2-102000042025012010.el8.aarch64.rpm
1515
oceanbase-ce-cdc-4.3.0.1-101000042024032211.el8.aarch64.rpm
1616
oceanbase-ce-cdc-4.3.1.0-100000082024051609.el8.aarch64.rpm
1717
oceanbase-ce-cdc-4.3.2.1-100000072024081218.el8.aarch64.rpm

‎deps/oblogproxy.el8.x86_64.deps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ oceanbase-ce-cdc-4.2.1.10-110000022024112010.el8.x86_64.rpm
1111
oceanbase-ce-cdc-4.2.2.1-101000022024031310.el8.x86_64.rpm
1212
oceanbase-ce-cdc-4.2.3.1-101000012024061810.el8.x86_64.rpm
1313
oceanbase-ce-cdc-4.2.4.0-100000032024070811.el8.x86_64.rpm
14-
oceanbase-ce-cdc-4.2.5.1-101000042024120918.el8.x86_64.rpm
14+
oceanbase-ce-cdc-4.2.5.2-102000042025012010.el8.x86_64.rpm
1515
oceanbase-ce-cdc-4.3.0.1-101000042024032211.el8.x86_64.rpm
1616
oceanbase-ce-cdc-4.3.1.0-100000082024051609.el8.x86_64.rpm
1717
oceanbase-ce-cdc-4.3.2.1-100000072024081218.el8.x86_64.rpm

‎rpm/obbinlog-build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ if [ "${TYPE}" = "TAR" ]; then
123123
make -j ${CONCURRENT} install oblogproxy
124124
cp -r ${PROJECT_DIR}/env/ ./oblogproxy/env
125125
mkdir -p ./oblogproxy/deps/lib && cp -r ./deps/lib/* ./oblogproxy/deps/lib
126-
tar --use-compress-program=pigz -cvpf ${PACKAGE_NAME}-"${VERSION}"-"${RELEASE}".tar.gz oblogproxy
126+
tar --use-compress-program=pigz -cvpf ${PACKAGE_NAME}-"${VERSION}"-"${RELEASE}"."${OS_ARCH}".tar.gz oblogproxy
127127

128-
mv ${PACKAGE_NAME}-"${VERSION}"-"${RELEASE}".tar.gz ${PROJECT_DIR}/ob_artifacts/
128+
mv ${PACKAGE_NAME}-"${VERSION}"-"${RELEASE}"."${OS_ARCH}".tar.gz ${PROJECT_DIR}/ob_artifacts/
129129

130130
else
131131
${CMAKE_COMMAND} -DCOMMUNITY_BUILD=${COMMUNITY_BUILD} -DCMAKE_VERBOSE_MAKEFILE=ON -DWITH_DEBUG=OFF -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -D OBLOGPROXY_PACKAGE_NAME=${PROJECT_NAME} -D OBLOGPROXY_PACKAGE_RELEASE=${RELEASE} ..

‎rpm/oboms-logproxy-VER.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2.1
1+
4.2.3

‎src/binlog/binlog-instance/binlog_storage.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,25 +142,25 @@ void StorageHandler::onEvent(SerializeEvent& data, std::int64_t sequence, bool e
142142
void SerializeExceptionHandler::handleEventException(
143143
const std::exception& ex, std::int64_t sequence, SerializeEvent& evt)
144144
{
145-
OMS_ERROR("Handle event exception: {},sequence :{}", ex.what(), sequence);
145+
OMS_ERROR("Handle event exception: {},sequence :{}, trace :{}", ex.what(), sequence, CommonUtils::get_stack_trace());
146146
_binlog_storage->stop();
147147
}
148148

149149
void SerializeExceptionHandler::handleOnStartException(const std::exception& ex)
150150
{
151-
OMS_ERROR("Serialize handle startup failed : {}", ex.what());
151+
OMS_ERROR("Serialize handle startup failed : {}, trace :{}", ex.what(), CommonUtils::get_stack_trace());
152152
_binlog_storage->stop();
153153
}
154154

155155
void SerializeExceptionHandler::handleOnShutdownException(const std::exception& ex)
156156
{
157-
OMS_ERROR("Serialize handle shutdown failed: {}", ex.what());
157+
OMS_ERROR("Serialize handle shutdown failed: {}, trace :{}", ex.what(), CommonUtils::get_stack_trace());
158158
_binlog_storage->stop();
159159
}
160160

161161
void SerializeExceptionHandler::handleOnTimeoutException(const std::exception& ex, std::int64_t sequence)
162162
{
163-
OMS_ERROR("Serialize handle timeout exception: {}, sequence: {}", ex.what(), sequence);
163+
OMS_ERROR("Serialize handle timeout exception: {}, sequence: {}, trace :{}", ex.what(), sequence, CommonUtils::get_stack_trace());
164164
_binlog_storage->stop();
165165
}
166166

‎src/binlog/binlog-instance/parallel_convert.cpp‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
//
44

55
#include "parallel_convert.h"
6+
#include "common_util.h"
67

78
#include <RoundRobinThreadAffinedTaskScheduler.h>
89
#include <YieldingWaitStrategy.h>
@@ -75,25 +76,25 @@ void BinlogEventConvertHandler::onEvent(BinlogEvent& binlog_event, std::int64_t
7576

7677
void ConvertExceptionHandler::handleEventException(const std::exception& ex, std::int64_t sequence, BinlogEvent& evt)
7778
{
78-
OMS_ERROR("Handle event exception: {},sequence :{}", ex.what(), sequence);
79+
OMS_ERROR("Handle event exception: {},sequence :{}, trace :{}", ex.what(), sequence, CommonUtils::get_stack_trace());
7980
converter.stop_converter();
8081
}
8182

8283
void ConvertExceptionHandler::handleOnStartException(const std::exception& ex)
8384
{
84-
OMS_ERROR("Handle event exception: {},sequence :{}", ex.what());
85+
OMS_ERROR("Handle event exception: {},sequence :{}, trace :{}", ex.what(), CommonUtils::get_stack_trace());
8586
converter.stop_converter();
8687
}
8788

8889
void ConvertExceptionHandler::handleOnShutdownException(const std::exception& ex)
8990
{
90-
OMS_ERROR("Handle event exception: {},sequence :{}", ex.what());
91+
OMS_ERROR("Handle event exception: {},sequence :{}, trace :{}", ex.what(), CommonUtils::get_stack_trace());
9192
converter.stop_converter();
9293
}
9394

9495
void ConvertExceptionHandler::handleOnTimeoutException(const std::exception& ex, std::int64_t sequence)
9596
{
96-
OMS_ERROR("Handle event exception: {},sequence :{}", ex.what(), sequence);
97+
OMS_ERROR("Handle event exception: {},sequence :{}, trace :{}", ex.what(), sequence, CommonUtils::get_stack_trace());
9798
converter.stop_converter();
9899
}
99100

@@ -650,7 +651,9 @@ int ParallelConvert::init(IObCdcAccess* obcdc)
650651
}
651652
void ParallelConvert::stop()
652653
{
653-
_disruptor->shutdown();
654+
// Fix dima: 2025010800106932017
655+
// If all converter threads exit at the same time, the records in the ringbuffer will never bee handled.
656+
_disruptor->shutdown(std::chrono::milliseconds(60 * 1000));
654657
_task_scheduler->stop();
655658
Thread::stop();
656659
}

0 commit comments

Comments
 (0)