diff --git a/cmake/script/do_bolt_opt b/cmake/script/do_bolt_opt index fc15adc0b..27fb3f12c 100755 --- a/cmake/script/do_bolt_opt +++ b/cmake/script/do_bolt_opt @@ -147,15 +147,10 @@ def main(): print_log("architecture: " + architecture) if architecture == "x86_64": - print_log("download corebolt-17.0.6.1-7.alios7.x86_64.rpm") - result = shell_run_command("wget http://yum.tbsite.net/taobao/7/x86_64/test/corebolt/corebolt-17.0.6.1-7.alios7.x86_64.rpm", - False, False) - print_log("rpm2cpio corebolt | cpio -div -u") - result = shell_run_command("rpm2cpio corebolt-17.0.6.1-7.alios7.x86_64.rpm | cpio -div -u", False, False) print_log("check llvm-bolt version") - result = shell_run_command("./opt/corebolt/bin/llvm-bolt --version", True, True) + result = shell_run_command(GLOBAL_CONF.build_dir + "/../deps/3rd/opt/corebolt/bin/llvm-bolt --version", True, True) print_log("do bolt opt") - result = shell_run_command("./opt/corebolt/bin/llvm-bolt " + GLOBAL_CONF.build_dir + "/src/observer/observer_without_bolt " + + result = shell_run_command(GLOBAL_CONF.build_dir + "/../deps/3rd/opt/corebolt/bin/llvm-bolt " + GLOBAL_CONF.build_dir + "/src/observer/observer_without_bolt " + "-o " + GLOBAL_CONF.build_dir + "/src/observer/observer " + "-data=" + GLOBAL_CONF.build_dir + "/../perf.fdata " + "-reorder-blocks=ext-tsp -reorder-functions=cdsort -split-functions -split-all-cold -dyno-stats --use-gnu-stack --update-debug-sections --bolt-info=false", @@ -167,10 +162,13 @@ def main(): return False print_log("bolt opt finish") else: - print_log("bolt opt is not supported on " + result["return_message"][0].strip() + " architecture.") + print_log("bolt opt is not supported on " + architecture + " architecture.") + return True if __name__ == '__main__': ''' __main__入口 ''' - main() + ret = main() + if not ret: + sys.exit(-1) diff --git a/src/observer/virtual_table/ob_mds_event_buffer.h b/src/observer/virtual_table/ob_mds_event_buffer.h index e75787508..4d1f4aabb 100644 --- a/src/observer/virtual_table/ob_mds_event_buffer.h +++ b/src/observer/virtual_table/ob_mds_event_buffer.h @@ -269,7 +269,7 @@ struct ObMdsEventBuffer { share::ObTaskController::get().allow_next_syslog(); if (OB_UNLIKELY(OB_LOGGER.need_to_print(::oceanbase::common::OB_LOG_ROOT::M_MDS, OB_LOG_LEVEL_INFO))) { ::oceanbase::common::OB_PRINT("[MDS.EVENT]", OB_LOG_LEVEL_INFO, file, line, func, OB_LOG_LOCATION_HASH_VAL, OB_SUCCESS, - event.event_, LOG_KVS(K(key), K(event))); + event.event_, LOG_KVS(K(key), K(event), KPC(mds_table))); } } if (is_inited_) {