wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4253 from sfc-gh-clin/use-VFSAsyncFile-checkInjectedError 

Use VFSAsyncFile::checkInjectedError to detect injected faults
This commit is contained in:
Steve Atherton 2021-01-30 15:00:35 -08:00 committed by GitHub
parent 5bd7e2ab6d 4c4d1ec6b0
commit 3b4577aa59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdbserver/KeyValueStoreSQLite.actor.cpp
View File

@ -309,7 +309,7 @@ struct SQLiteDB : NonCopyable {
int tables[] = {1, table, freetable};
TraceEvent("BTreeIntegrityCheckBegin").detail("Filename", filename);
char* e = sqlite3BtreeIntegrityCheck(btree, tables, 3, 1000, &errors, verbose);
if (!(g_network->isSimulated() && (g_simulator.getCurrentProcess()->fault_injection_p1 || g_simulator.getCurrentProcess()->rebooting))) {
if (!(g_network->isSimulated() && VFSAsyncFile::checkInjectedError())) {
TraceEvent((errors||e) ? SevError : SevInfo, "BTreeIntegrityCheckResults").detail("Filename", filename).detail("ErrorTotal", errors);
if(e != nullptr) {
// e is a string containing 1 or more lines. Create a separate trace event for each line.
@ -1657,7 +1657,7 @@ private:
if (checkIntegrityOnOpen || EXPENSIVE_VALIDATION) {
if(conn.check(false) != 0) {
// A corrupt btree structure must not be used.
if (g_network->isSimulated() && (g_simulator.getCurrentProcess()->fault_injection_p1 || g_simulator.getCurrentProcess()->machine->machineProcess->fault_injection_p1 || g_simulator.getCurrentProcess()->rebooting)) {
if (g_network->isSimulated() && VFSAsyncFile::checkInjectedError()) {
throw file_corrupt().asInjectedFault();
} else {
throw file_corrupt();