Merge pull request #13254 from tclinkenbeard-oai/dev/tclinkenbeard/inline-buggify-function

Replace `BUGGIFY` macros with inline functions

Author: tclinkenbeard-oai

fdbclient/BackupAgentBase.cpp

@@ -483,7 +483,7 @@ Future<Void> readCommitted(Database cx,
 
 			// When this buggify line is enabled, if there are more than 1 result then use half of the results
 			// Copy the data instead of messing with the results directly to avoid TSS issues.
-			if (values.size() > 1 && BUGGIFY) {
+			if (values.size() > 1 && buggify()) {
 				RangeResult copy;
 				// only copy first half of values into copy
 				for (int i = 0; i < values.size() / 2; i++) {
@@ -566,7 +566,7 @@ Future<Void> readCommitted(Database cx,
 
 			// When this buggify line is enabled, if there are more than 1 result then use half of the results.
 			// Copy the data instead of messing with the results directly to avoid TSS issues.
-			if (rangevalue.size() > 1 && BUGGIFY) {
+			if (rangevalue.size() > 1 && buggify()) {
 				RangeResult copy;
 				// only copy first half of rangevalue into copy
 				for (int i = 0; i < rangevalue.size() / 2; i++) {
@@ -928,7 +928,7 @@ Future<Void> applyMutations(Database cx,
 			co_await coalesceKeyVersionCache(
 			    uid, newEndVersion, keyVersion, commit, committedVersion, addActor, &commitLock);
 			beginVersion = newEndVersion;
-			if (BUGGIFY) {
+			if (buggify()) {
 				co_await delay(2.0);
 			}
 		}
@@ -1012,7 +1012,7 @@ static Future<Void> _eraseLogData(Reference<ReadYourWritesTransaction> tr,
 		}
 	}
 
-	if (endVersion.present() || backupVersions.size() != 1 || BUGGIFY) {
+	if (endVersion.present() || backupVersions.size() != 1 || buggify()) {
 		if (!endVersion.present()) {
 			// Clear current backup version history
 			tr->clear(backupLatestVersionsKey);
@@ -1028,7 +1028,7 @@ static Future<Void> _eraseLogData(Reference<ReadYourWritesTransaction> tr,
 		if (clearLogRangesRequired) {
 			if ((nextSmallestVersion - currBeginVersion) / CLIENT_KNOBS->LOG_RANGE_BLOCK_SIZE >=
 			        std::numeric_limits<uint8_t>::max() ||
-			    BUGGIFY) {
+			    buggify()) {
 				Key baLogRangePrefix = destUidValue.withPrefix(backupLogKeys.begin);
 
 				for (int h = 0; h <= std::numeric_limits<uint8_t>::max(); h++) {

fdbclient/BackupContainerFileSystem.cpp

@@ -1561,7 +1561,7 @@ Future<Reference<IBackupFile>> BackupContainerFileSystem::writeRangeFile(Version
 	}
 
 	return writeFile(BackupContainerFileSystemImpl::snapshotFolderString(snapshotBeginVersion) +
-	                 format("/%d/", snapshotFileCount / (BUGGIFY ? 1 : 5000)) + fileName);
+	                 format("/%d/", snapshotFileCount / (buggify() ? 1 : 5000)) + fileName);
 }
 
 Future<Void> BackupContainerFileSystem::writePartitionListFile(Version v, std::string contents) {
@@ -2017,7 +2017,7 @@ Future<Void> testBackupContainer(std::string url,
 				writes.push_back(c->writeKeyspaceSnapshotFile(snapshots.rbegin()->second,
 				                                              snapshotBeginEndKeys.rbegin()->second,
 				                                              snapshotSizes.rbegin()->second,
-				                                              IncludeKeyRangeMap(BUGGIFY)));
+				                                              IncludeKeyRangeMap(buggify())));
 				snapshots[v] = {};
 				snapshotBeginEndKeys[v] = {};
 				snapshotSizes[v] = 0;
@@ -2440,7 +2440,7 @@ Future<Void> testBackupContainerWithMissingLogRanges(std::string url, Optional<s
 		writes.push_back(c->writeKeyspaceSnapshotFile(rangeFileNames,
 		                                              snapshotBeginEndKeys,
 		                                              deterministicRandom()->randomInt(0, 2e6),
-		                                              IncludeKeyRangeMap(BUGGIFY)));
+		                                              IncludeKeyRangeMap(buggify())));
 
 		// if the last missing log file overlaps with the current snapshot,
 		// mark snapshotsMissingLogs for current snapshot as true.
@@ -2575,7 +2575,7 @@ Future<Void> testBackupContinuousLogEndVer(std::string url, Optional<std::string
 
 	// writing snapshot file
 	writes.push_back(c->writeKeyspaceSnapshotFile(
-	    rangeFileNames, snapshotBeginEndKeys, deterministicRandom()->randomInt(0, 2e6), IncludeKeyRangeMap(BUGGIFY)));
+	    rangeFileNames, snapshotBeginEndKeys, deterministicRandom()->randomInt(0, 2e6), IncludeKeyRangeMap(buggify())));
 	co_await waitForAll(writes);
 
 	BackupFileList fileList = co_await c->dumpFileList();

fdbclient/BackupContainerLocalDirectory.cpp

@@ -34,7 +34,7 @@ class BackupFile : public IBackupFile, ReferenceCounted<BackupFile> {
 	BackupFile(const std::string& fileName, Reference<IAsyncFile> file, const std::string& finalFullPath)
 	  : IBackupFile(fileName), m_file(file), m_writeOffset(0), m_finalFullPath(finalFullPath),
 	    m_blockSize(CLIENT_KNOBS->BACKUP_LOCAL_FILE_WRITE_BLOCK) {
-		if (BUGGIFY) {
+		if (buggify()) {
 			m_blockSize = deterministicRandom()->randomInt(100, 20000);
 		}
 		m_buffer.reserve(m_buffer.arena(), m_blockSize);