diff --git a/src/chk/chk.pb-c.c b/src/chk/chk.pb-c.c index aa396341841..ed313349aa5 100644 --- a/src/chk/chk.pb-c.c +++ b/src/chk/chk.pb-c.c @@ -91,12 +91,12 @@ static const ProtobufCFieldDescriptor chk__check_report__field_descriptors[16] = 0,NULL,NULL /* reserved1,reserved2, etc */ }, { - "repaired", + "result", 4, PROTOBUF_C_LABEL_NONE, - PROTOBUF_C_TYPE_BOOL, + PROTOBUF_C_TYPE_INT32, 0, /* quantifier_offset */ - offsetof(Chk__CheckReport, repaired), + offsetof(Chk__CheckReport, result), NULL, NULL, 0, /* flags */ @@ -260,7 +260,7 @@ static const unsigned chk__check_report__field_indices_by_name[] = { 8, /* field[8] = objid */ 6, /* field[6] = pool_uuid */ 4, /* field[4] = rank */ - 3, /* field[3] = repaired */ + 3, /* field[3] = result */ 0, /* field[0] = seq */ 5, /* field[5] = target */ 11, /* field[11] = timestamp */ @@ -445,7 +445,7 @@ static const ProtobufCEnumValue chk__check_inst_status__enum_values_by_number[7] { "CIS_STOPPED", "CHK__CHECK_INST_STATUS__CIS_STOPPED", 3 }, { "CIS_FAILED", "CHK__CHECK_INST_STATUS__CIS_FAILED", 4 }, { "CIS_PAUSED", "CHK__CHECK_INST_STATUS__CIS_PAUSED", 5 }, - { "CIS_CRASHED", "CHK__CHECK_INST_STATUS__CIS_CRASHED", 6 }, + { "CIS_IMPLICATED", "CHK__CHECK_INST_STATUS__CIS_IMPLICATED", 6 }, }; static const ProtobufCIntRange chk__check_inst_status__value_ranges[] = { {0, 0},{0, 7} @@ -453,8 +453,8 @@ static const ProtobufCIntRange chk__check_inst_status__value_ranges[] = { static const ProtobufCEnumValueIndex chk__check_inst_status__enum_values_by_name[7] = { { "CIS_COMPLETED", 2 }, - { "CIS_CRASHED", 6 }, { "CIS_FAILED", 4 }, + { "CIS_IMPLICATED", 6 }, { "CIS_INIT", 0 }, { "CIS_PAUSED", 5 }, { "CIS_RUNNING", 1 }, @@ -475,7 +475,7 @@ const ProtobufCEnumDescriptor chk__check_inst_status__descriptor = chk__check_inst_status__value_ranges, NULL,NULL,NULL,NULL /* reserved[1234] */ }; -static const ProtobufCEnumValue chk__check_pool_status__enum_values_by_number[6] = +static const ProtobufCEnumValue chk__check_pool_status__enum_values_by_number[8] = { { "CPS_UNCHECKED", "CHK__CHECK_POOL_STATUS__CPS_UNCHECKED", 0 }, { "CPS_CHECKING", "CHK__CHECK_POOL_STATUS__CPS_CHECKING", 1 }, @@ -483,17 +483,21 @@ static const ProtobufCEnumValue chk__check_pool_status__enum_values_by_number[6] { "CPS_FAILED", "CHK__CHECK_POOL_STATUS__CPS_FAILED", 3 }, { "CPS_PAUSED", "CHK__CHECK_POOL_STATUS__CPS_PAUSED", 4 }, { "CPS_PENDING", "CHK__CHECK_POOL_STATUS__CPS_PENDING", 5 }, + { "CPS_STOPPED", "CHK__CHECK_POOL_STATUS__CPS_STOPPED", 6 }, + { "CPS_IMPLICATED", "CHK__CHECK_POOL_STATUS__CPS_IMPLICATED", 7 }, }; static const ProtobufCIntRange chk__check_pool_status__value_ranges[] = { -{0, 0},{0, 6} +{0, 0},{0, 8} }; -static const ProtobufCEnumValueIndex chk__check_pool_status__enum_values_by_name[6] = +static const ProtobufCEnumValueIndex chk__check_pool_status__enum_values_by_name[8] = { { "CPS_CHECKED", 2 }, { "CPS_CHECKING", 1 }, { "CPS_FAILED", 3 }, + { "CPS_IMPLICATED", 7 }, { "CPS_PAUSED", 4 }, { "CPS_PENDING", 5 }, + { "CPS_STOPPED", 6 }, { "CPS_UNCHECKED", 0 }, }; const ProtobufCEnumDescriptor chk__check_pool_status__descriptor = @@ -503,9 +507,9 @@ const ProtobufCEnumDescriptor chk__check_pool_status__descriptor = "CheckPoolStatus", "Chk__CheckPoolStatus", "chk", - 6, + 8, chk__check_pool_status__enum_values_by_number, - 6, + 8, chk__check_pool_status__enum_values_by_name, 1, chk__check_pool_status__value_ranges, diff --git a/src/chk/chk.pb-c.h b/src/chk/chk.pb-c.h index 0e2decba3de..96b8269ba39 100644 --- a/src/chk/chk.pb-c.h +++ b/src/chk/chk.pb-c.h @@ -10,12 +10,12 @@ PROTOBUF_C__BEGIN_DECLS #if PROTOBUF_C_VERSION_NUMBER < 1003000 # error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. -#elif 1003003 < PROTOBUF_C_MIN_COMPILER_VERSION +#elif 1004000 < PROTOBUF_C_MIN_COMPILER_VERSION # error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. #endif -typedef struct _Chk__CheckReport Chk__CheckReport; +typedef struct Chk__CheckReport Chk__CheckReport; /* --- enums --- */ @@ -254,9 +254,9 @@ typedef enum _Chk__CheckInstStatus { */ CHK__CHECK_INST_STATUS__CIS_PAUSED = 5, /* - * Engine crashed during DAOS check scan, allow to rejoin. + * Check on the engine exit for other engine failure, do not rejoin. */ - CHK__CHECK_INST_STATUS__CIS_CRASHED = 6 + CHK__CHECK_INST_STATUS__CIS_IMPLICATED = 6 PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(CHK__CHECK_INST_STATUS) } Chk__CheckInstStatus; /* @@ -280,13 +280,21 @@ typedef enum _Chk__CheckPoolStatus { */ CHK__CHECK_POOL_STATUS__CPS_FAILED = 3, /* - * Checking the pool has been put on hold or stopped. + * Checking the pool has been paused because engine exit. */ CHK__CHECK_POOL_STATUS__CPS_PAUSED = 4, /* * Waiting for the decision from the admin. */ - CHK__CHECK_POOL_STATUS__CPS_PENDING = 5 + CHK__CHECK_POOL_STATUS__CPS_PENDING = 5, + /* + * DAOS check on the pool has been stopped explicitly. + */ + CHK__CHECK_POOL_STATUS__CPS_STOPPED = 6, + /* + * Check on the pool is stopped because of other pool or engine failure. + */ + CHK__CHECK_POOL_STATUS__CPS_IMPLICATED = 7 PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(CHK__CHECK_POOL_STATUS) } Chk__CheckPoolStatus; /* @@ -350,7 +358,7 @@ typedef enum _Chk__CheckScanPhase { * If the CheckReport::msg is not enough to help admin to make the decision, then we * may have to leverage DAOS debug tools to dump more information from related target. */ -struct _Chk__CheckReport +struct Chk__CheckReport { ProtobufCMessage base; /* @@ -366,9 +374,12 @@ struct _Chk__CheckReport */ Chk__CheckInconsistAction action; /* - * Repaired or not, meaningless if the action is CIA_INTERACT. + * Repair result: zero is for repaired successfully. + * negative value if failed to repair. + * positive value is for CIA_IGNORE or dryrun mode. + * It is meaningless if the action is CIA_INTERACT. */ - protobuf_c_boolean repaired; + int32_t result; /* * Inconsistency happened on which rank if applicable. */ diff --git a/src/proto/chk/chk.proto b/src/proto/chk/chk.proto index a07495c1f88..65ba8749c2a 100644 --- a/src/proto/chk/chk.proto +++ b/src/proto/chk/chk.proto @@ -146,7 +146,7 @@ enum CheckInstStatus { CIS_STOPPED = 3; // DAOS check has been explicitly stopped, do not allow to rejoin. CIS_FAILED = 4; // DAOS check auto stopped for some unrecoverable failure, do not rejoin. CIS_PAUSED = 5; // DAOS check has been paused because engine exit, allow to rejoin. - CIS_CRASHED = 6; // Engine crashed during DAOS check scan, allow to rejoin. + CIS_IMPLICATED = 6; // Check on the engine exit for other engine failure, do not rejoin. } // The pool status for DAOS check. @@ -155,8 +155,10 @@ enum CheckPoolStatus { CPS_CHECKING = 1; // The pool is being checked. CPS_CHECKED = 2; // DAOS check has successfully completed all the passes on this pool. CPS_FAILED = 3; // DAOS check could not be completed due to some unrecoverable failure. - CPS_PAUSED = 4; // Checking the pool has been put on hold or stopped. + CPS_PAUSED = 4; // Checking the pool has been paused because engine exit. CPS_PENDING = 5; // Waiting for the decision from the admin. + CPS_STOPPED = 6; // DAOS check on the pool has been stopped explicitly. + CPS_IMPLICATED = 7; // Check on the pool is stopped because of other pool or engine failure. } // DAOS check engine scan phases. @@ -193,7 +195,11 @@ message CheckReport { uint64 seq = 1; // DAOS Check event sequence, unique for the instance. CheckInconsistClass class = 2; // Inconsistency class CheckInconsistAction action = 3; // The action taken to repair the inconsistency - bool repaired = 4; // Repaired or not, meaningless if the action is CIA_INTERACT. + // Repair result: zero is for repaired successfully. + // negative value if failed to repair. + // positive value is for CIA_IGNORE or dryrun mode. + // It is meaningless if the action is CIA_INTERACT. + int32 result = 4; uint32 rank = 5; // Inconsistency happened on which rank if applicable. uint32 target = 6; // Inconsistency happened on which target in the rank if applicable. string pool_uuid = 7; // The consistency is in which pool if applicable.