mirror of https://github.com/facebook/rocksdb.git
Print status when VerifyOrSyncValue() fails with non-OK status (#12217)
Summary: This should print more helpful message when a non-ok status like Corruption is returned. Pull Request resolved: https://github.com/facebook/rocksdb/pull/12217 Test Plan: CI passes. Reviewed By: jaykorean Differential Revision: D52637595 Pulled By: cbi42 fbshipit-source-id: e810eeb4cba633d4d4c5d198da4468995e4ed427
This commit is contained in:
parent
1de6940980
commit
cd15331711
|
@ -2043,6 +2043,10 @@ class NonBatchedOpsStressTest : public StressTest {
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
char expected_value_data[kValueMaxLen];
|
||||||
|
size_t expected_value_data_size =
|
||||||
|
GenerateValue(expected_value.GetValueBase(), expected_value_data,
|
||||||
|
sizeof(expected_value_data));
|
||||||
|
|
||||||
// compare value_from_db with the value in the shared state
|
// compare value_from_db with the value in the shared state
|
||||||
if (s.ok()) {
|
if (s.ok()) {
|
||||||
|
@ -2054,10 +2058,6 @@ class NonBatchedOpsStressTest : public StressTest {
|
||||||
key, value_from_db, "");
|
key, value_from_db, "");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
char expected_value_data[kValueMaxLen];
|
|
||||||
size_t expected_value_data_size =
|
|
||||||
GenerateValue(expected_value.GetValueBase(), expected_value_data,
|
|
||||||
sizeof(expected_value_data));
|
|
||||||
if (!ExpectedValueHelper::InExpectedValueBaseRange(
|
if (!ExpectedValueHelper::InExpectedValueBaseRange(
|
||||||
value_base_from_db, expected_value, expected_value)) {
|
value_base_from_db, expected_value, expected_value)) {
|
||||||
VerificationAbort(shared, msg_prefix + ": Unexpected value found", cf,
|
VerificationAbort(shared, msg_prefix + ": Unexpected value found", cf,
|
||||||
|
@ -2084,17 +2084,16 @@ class NonBatchedOpsStressTest : public StressTest {
|
||||||
} else if (s.IsNotFound()) {
|
} else if (s.IsNotFound()) {
|
||||||
if (ExpectedValueHelper::MustHaveExisted(expected_value,
|
if (ExpectedValueHelper::MustHaveExisted(expected_value,
|
||||||
expected_value)) {
|
expected_value)) {
|
||||||
char expected_value_data[kValueMaxLen];
|
|
||||||
size_t expected_value_data_size =
|
|
||||||
GenerateValue(expected_value.GetValueBase(), expected_value_data,
|
|
||||||
sizeof(expected_value_data));
|
|
||||||
VerificationAbort(
|
VerificationAbort(
|
||||||
shared, msg_prefix + ": Value not found: " + s.ToString(), cf, key,
|
shared, msg_prefix + ": Value not found: " + s.ToString(), cf, key,
|
||||||
"", Slice(expected_value_data, expected_value_data_size));
|
"", Slice(expected_value_data, expected_value_data_size));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
assert(false);
|
VerificationAbort(shared, msg_prefix + "Non-OK status: " + s.ToString(),
|
||||||
|
cf, key, "",
|
||||||
|
Slice(expected_value_data, expected_value_data_size));
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue