hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

don't return -4016 in case of FAILOVER + RESTART + SWITCH LEADER

Browse Source
This commit is contained in:
HaHaJeff
2023-05-30 10:41:51 +00:00
committed by ob-robot
parent 5fe8470308
commit 912d6e945d
4 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/logservice/archiveservice/ob_archive_fetcher.cpp
View File

@ -587,7 +587,7 @@ int ObArchiveFetcher::generate_send_buffer_(PalfGroupBufferIterator &iter, TmpMe
while (OB_SUCC(ret) && ! iter_end && ! piece_change && ! has_set_stop()) {
buffer = NULL;
if (OB_FAIL(iter.next(max_scn))) {
if (OB_ITER_END == ret || common::OB_NEED_RETRY == ret) {
if (iterator_need_retry_(ret)) {
ARCHIVE_LOG(TRACE, "iterate log entry to end", K(ret), K(iter));
} else {
ARCHIVE_LOG(WARN, "iterate log entry failed", K(ret), K(iter));
@ -632,7 +632,7 @@ int ObArchiveFetcher::generate_send_buffer_(PalfGroupBufferIterator &iter, TmpMe
}
}
}
if (OB_ITER_END == ret || OB_NEED_RETRY == ret) {
if (iterator_need_retry_(ret)) {
ret = OB_SUCCESS;
}
@ -1251,5 +1251,10 @@ int64_t ObArchiveFetcher::TmpMemoryHelper::get_reserved_buf_size_() const
{
return sizeof(ObArchiveSendTask) + ARCHIVE_FILE_HEADER_SIZE;
}
bool ObArchiveFetcher::iterator_need_retry_(const int ret) const
{
return OB_NEED_RETRY == ret || OB_ITER_END == ret || OB_PARTIAL_LOG == ret;
}
} // namespace archive
} // namespace oceanbase

2
src/logservice/archiveservice/ob_archive_fetcher.h
View File

@ -227,6 +227,8 @@ private:
bool in_doing_status_(const ArchiveKey &key) const;
void statistic(const int64_t log_size, const int64_t ts);
bool iterator_need_retry_(const int ret) const;
private:
class TmpMemoryHelper
{

39
src/logservice/palf/log_iterator_impl.h
View File

@ -14,11 +14,11 @@
#define OCEANBASE_LOGSERVICE_LOG_ITERATOR_
#include <type_traits>
#include "lib/ob_errno.h"
#include "lib/alloc/alloc_assist.h"
#include "lib/utility/ob_utility.h"
#include "lib/utility/ob_macro_utils.h"
#include "lib/utility/ob_print_utils.h" // TO_STRING_KV
#include "share/ob_errno.h" // OB_PARTIAL_LOG
#include "log_define.h" // LogItemType
#include "log_block_header.h" // LogBlockHeader
#include "lsn.h" // LSN
@ -113,21 +113,34 @@ public:
// OB_CHECKSUM_ERROR
// - the accumulate checksum calc by accum_checksum_ and the data checksum of LogGroupEntry is not
// same as the accumulate checksum of LogGroupEntry
// OB_PARTIAL_LOG
// - this replica has not finished flashback, and iterator start lsn is not the header of LogGroupEntry.
int next(const share::SCN &replayable_point_scn);
// param[in] replayable point scn, iterator will ensure that no log will return when the log scn is greater than
// 'replayable_point_scn' and the log is raw write
// param[out] the min log scn of next log, is's valid only when return value is OB_ITER_END
// param[out] iterate_end_by_replayable_point, return OB_ITER_END whether caused by replayable_point_scn.
// @retval
// OB_SUCCESS.
// OB_INVALID_DATA.
// OB_ITER_END, has iterated to the end of block.
// OB_NEED_RETRY, the data in cache is not integrity, and the integrity data has been truncate from disk,
// need read data from storage again.(data in cache will not been clean up, therefore,
// user need used a new iterator to read data again)
// OB_ERR_OUT_LOWER_BOUND, block has been recycled
//
// OB_ITER_END
// - has iterated to the end of block.
// OB_NEED_RETRY
// - the data in cache is not integrity, and the integrity data has been truncate from disk,
// need read data from storage again.(data in cache will not been clean up, therefore,
// user need used a new iterator to read data again)
// - if the end_lsn get from get_file_end_lsn is smaller than 'log_tail_' of LogStorage, and it's
// not the exact boundary of LogGroupEntry(for PalfGroupeBufferIterator, or LogEntry for PalfBufferIterator),
// OB_NEED_RETRY may be return.
// - if read_data_from_storage_ is concurrent with the last step of flashback, opening last block on disk may be failed
// due to rename, return OB_NEED_RETRY in this case.(TODO by runlin: retry by myself)
// OB_ERR_OUT_LOWER_BOUND
// - block has been recycled
// OB_CHECKSUM_ERROR
// - the accumulate checksum calc by accum_checksum_ and the data checksum of LogGroupEntry is not
// same as the accumulate checksum of LogGroupEntry
// OB_PARTIAL_LOG
// - this replica has not finished flashback, and iterator start lsn is not the header of LogGroupEntry.
int next(const share::SCN &replayable_point_scn,
share::SCN &next_min_scn,
bool &iterate_end_by_replayable_point);
@ -158,6 +171,8 @@ private:
// OB_ITER_END
// OB_ERR_OUT_LOWER_BOUND
// OB_NEED_RETRY: means the data has been truncate concurrently
// OB_PARTIAL_LOG: this replica has not finished flashback, and iterator start lsn
// is not the header of LogGroupEntry.
int get_next_entry_(const SCN &replayable_point_scn,
IterateEndInfo &info);
@ -175,6 +190,9 @@ private:
// -- means accumulate checksum is not matched.
// OB_ITER_END
// -- means log entry is iterated end by replayable_point_scn
// OB_PARTIAL_LOG
// -- this replica has not finished flashback, and iterator start lsn is not the header of
// LogGroupEntry.
int parse_one_entry_(const SCN &replayable_point_scn,
IterateEndInfo &info);
@ -210,8 +228,9 @@ private:
PALF_LOG(TRACE, "iterate end by replayable_point", KPC(this), K(replayable_point_scn), K(info));
}
} else {
ret = OB_ERR_UNEXPECTED;
PALF_LOG(ERROR, "parse LogEntry failed, unexpected error", KPC(this), K(replayable_point_scn), K(info));
ret = OB_PARTIAL_LOG;
PALF_LOG(WARN, "parse LogEntry failed, may be in flashback mode and this replica has not finished flashback",
KPC(this), K(replayable_point_scn), K(info));
}
return ret;
}

3
src/logservice/palf/palf_iterator.h
View File

@ -93,6 +93,7 @@ public:
// need read data from storage eagin.(data in cache will not been clean up, therefore,
// user need used a new iterator to read data again)
// OB_ERR_OUT_LOWER_BOUND, block has been recycled
// OB_PARTIAL_LOG, this replica has not finished flashback, and iterator start lsn is not the header of LogGroupEntry.
int next()
{
int ret = OB_SUCCESS;
@ -118,6 +119,7 @@ public:
// need read data from storage eagin.(data in cache will not been clean up, therefore,
// user need used a new iterator to read data again)
// OB_ERR_OUT_LOWER_BOUND, block has been recycled
// OB_PARTIAL_LOG, this replica has not finished flashback, and iterator start lsn is not the header of LogGroupEntry.
int next(const share::SCN &replayable_point_scn)
{
int ret = OB_SUCCESS;
@ -144,6 +146,7 @@ public:
// need read data from storage eagin.(data in cache will not been clean up, therefore,
// user need used a new iterator to read data again)
// OB_ERR_OUT_LOWER_BOUND, block has been recycled
// OB_PARTIAL_LOG, this replica has not finished flashback, and iterator start lsn is not the header of LogGroupEntry.
int next(const share::SCN &replayable_point_scn,
share::SCN &next_min_scn,
bool &iterate_end_by_replayable_point)