[FEAT MERGE] Merge syslog user experience improvement to master

Co-authored-by: Charles0429 <xiezhenjiang@gmail.com>
Co-authored-by: tino247 <tino247@126.com>
Co-authored-by: chaser-ch <chaser.ch@antgroup.com>
This commit is contained in:
stdliu
2023-02-06 15:52:23 +08:00
committed by ob-robot
parent 1de9266dd0
commit f8c5c2647f
796 changed files with 4465 additions and 3036 deletions

View File

@ -40,7 +40,7 @@ const char* ObTenantSwitchoverStatus::to_str() const
const char *type_str = "UNKNOWN";
if (OB_UNLIKELY(value_ >= ARRAYSIZEOF(TENANT_SWITCHOVER_ARRAY)
|| value_ < INVALID_STATUS)) {
LOG_ERROR("fatal error, unknown switchover status", K_(value));
LOG_ERROR_RET(OB_ERR_UNEXPECTED, "fatal error, unknown switchover status", K_(value));
} else {
type_str = TENANT_SWITCHOVER_ARRAY[value_];
}
@ -61,7 +61,7 @@ ObTenantSwitchoverStatus::ObTenantSwitchoverStatus(const ObString &str)
}
if (INVALID_STATUS == value_) {
LOG_WARN("invalid switchover status", K_(value), K(str));
LOG_WARN_RET(OB_ERR_UNEXPECTED, "invalid switchover status", K_(value), K(str));
}
}