diff --git a/src/cmd/dsscmd_inq.c b/src/cmd/dsscmd_inq.c index 3d384b7245334070897e928007da41378c4aaaa3..2f465d2eb30234c13727c0412fb4b37a69e261c1 100644 --- a/src/cmd/dsscmd_inq.c +++ b/src/cmd/dsscmd_inq.c @@ -378,7 +378,8 @@ status_t dss_check_volume_register(char *entry_path, int64 host_id, bool32 *is_r *is_reg = DSS_FALSE; } - LOG_RUN_INF("Succeed to check volume register, vol_path is %s, result is %d.", entry_path, *is_reg); + LOG_RUN_INF( + "Succeed to check volume register, vol_path is %s, host_id %lld, result is %d.", entry_path, host_id, *is_reg); return CM_SUCCESS; } diff --git a/src/common/dss_io_fence.c b/src/common/dss_io_fence.c index eb9acd8aacdbd5abf60646f8e111f04232ac0cbf..e06ab46d4401ad3b16133e99fb697eecd94abf28 100644 --- a/src/common/dss_io_fence.c +++ b/src/common/dss_io_fence.c @@ -82,7 +82,7 @@ status_t dss_iof_kick_one_volume(char *dev, int64 rk, int64 rk_kick, ptlist_t *r is_reg = dss_iof_is_register(dev, rk, regs); if (!is_reg) { - LOG_DEBUG_INF("[FENCE][KICK] Need to register node to dev before kick other nodes, dev %s, org rk %lld.", + LOG_RUN_INF("[FENCE][KICK] Need to register node to dev before kick other nodes, dev %s, org rk %lld.", reg_info.dev, reg_info.rk); DSS_THROW_ERROR_EX(ERR_DSS_VOLUME_FENCE_CHECK_COND, "Need to register node to dev before kick other nodes"); return CM_ERROR; @@ -90,7 +90,7 @@ status_t dss_iof_kick_one_volume(char *dev, int64 rk, int64 rk_kick, ptlist_t *r is_reg = dss_iof_is_register(dev, rk_kick, regs); if (!is_reg) { - LOG_DEBUG_INF( + LOG_RUN_INF( "[FENCE][KICK] The node to be kicked is not registered on the target volume, dev %s, rk_kick %lld.", dev, rk_kick); return CM_SUCCESS; @@ -102,7 +102,7 @@ status_t dss_iof_kick_one_volume(char *dev, int64 rk, int64 rk_kick, ptlist_t *r reg_info.type = RESERV_TYPE_REGISTER_ACCESS; status = cm_iof_kick(®_info); if (status != CM_SUCCESS) { - LOG_DEBUG_ERR("[FENCE][KICK] kick dev failed, org rk %lld, org sark %lld, dev %s.", reg_info.rk, + LOG_RUN_INF("[FENCE][KICK] kick dev failed, org rk %lld, org sark %lld, dev %s.", reg_info.rk, reg_info.rk_kick, reg_info.dev); return status; } @@ -123,7 +123,7 @@ status_t dss_iof_kick_all_volumes(dss_vg_info_t *dss_vg_info, int64 rk, int64 rk status = dss_iof_kick_one_volume(item->entry_path, rk, rk_kick, reg_list); if (status != CM_SUCCESS) { // continue to kick next volume - LOG_DEBUG_ERR("[FENCE][KICK] kick entry dev failed, dev %s.", item->entry_path); + LOG_RUN_INF("[FENCE][KICK] kick entry dev failed, dev %s.", item->entry_path); } // volume_attrs[0] is the sys dev @@ -135,7 +135,7 @@ status_t dss_iof_kick_all_volumes(dss_vg_info_t *dss_vg_info, int64 rk, int64 rk status = dss_iof_kick_one_volume(item->dss_ctrl->volume.defs[j].name, rk, rk_kick, reg_list); if (status != CM_SUCCESS) { // continue to kick next volume - LOG_DEBUG_ERR("[FENCE][KICK] kick data dev failed, dev %s.", item->entry_path); + LOG_RUN_INF("[FENCE][KICK] kick data dev failed, dev %s.", item->entry_path); } } } @@ -214,19 +214,19 @@ status_t dss_iof_kick_all(dss_vg_info_t *vg_info, dss_config_t *inst_cfg, int64 ptlist_t reg_list; if (rk_kick == inst_cfg->params.inst_id) { - LOG_DEBUG_ERR( + LOG_RUN_INF( "[FENCE][KICK] Can't kick current node, rk_kick %lld, inst id %lld.", rk_kick, inst_cfg->params.inst_id); return CM_ERROR; } bool32 result = (bool32)(rk == inst_cfg->params.inst_id); DSS_RETURN_IF_FALSE2( - result, LOG_DEBUG_ERR("[FENCE][KICK] Must use inst id of current node as rk, rk %lld, inst id %lld.", rk, + result, LOG_RUN_INF("[FENCE][KICK] Must use inst id of current node as rk, rk %lld, inst id %lld.", rk, inst_cfg->params.inst_id)); cm_ptlist_init(®_list); status = dss_iof_inql_regs(vg_info, ®_list); - DSS_RETURN_IFERR3(status, dss_destroy_ptlist(®_list), LOG_DEBUG_ERR("[FENCE][KICK] Inquiry regs info failed.")); + DSS_RETURN_IFERR3(status, dss_destroy_ptlist(®_list), LOG_RUN_INF("[FENCE][KICK] Inquiry regs info failed.")); status = dss_iof_kick_all_volumes(vg_info, rk, rk_kick, ®_list); DSS_RETURN_IFERR2(status, dss_destroy_ptlist(®_list));