diff --git a/fdbserver/DiskQueue.actor.cpp b/fdbserver/DiskQueue.actor.cpp index a1be3733e6..1efc6ecee6 100644 --- a/fdbserver/DiskQueue.actor.cpp +++ b/fdbserver/DiskQueue.actor.cpp @@ -385,6 +385,7 @@ public: waitfor.push_back(self->files[1].f->truncate(self->fileExtensionBytes)); self->files[1].size = self->fileExtensionBytes; } else { + TEST(true); // Truncating DiskQueue file const int64_t startingSize = self->files[1].size; self->files[1].size -= std::min(maxShrink, self->files[1].size); self->files[1].size = std::max(self->files[1].size, self->fileExtensionBytes); diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp index ad4c797b8d..993ad64e4f 100644 --- a/fdbserver/Knobs.cpp +++ b/fdbserver/Knobs.cpp @@ -83,7 +83,7 @@ void ServerKnobs::initialize(bool randomize, ClientKnobs* clientKnobs, bool isSi init( TLOG_SPILL_REFERENCE_MAX_BYTES_PER_BATCH, 16<<10 ); if ( randomize && BUGGIFY ) TLOG_SPILL_REFERENCE_MAX_BYTES_PER_BATCH = 500; init( DISK_QUEUE_FILE_EXTENSION_BYTES, 10<<20 ); // BUGGIFYd per file within the DiskQueue init( DISK_QUEUE_FILE_SHRINK_BYTES, 100<<20 ); // BUGGIFYd per file within the DiskQueue - init( DISK_QUEUE_MAX_TRUNCATE_BYTES, 2<<30 ); if ( randomize && BUGGIFY ) DISK_QUEUE_MAX_TRUNCATE_BYTES = 0; + init( DISK_QUEUE_MAX_TRUNCATE_BYTES, 2LL<<30 ); if ( randomize && BUGGIFY ) DISK_QUEUE_MAX_TRUNCATE_BYTES = 0; init( TLOG_DEGRADED_DURATION, 5.0 ); init( MAX_CACHE_VERSIONS, 10e6 ); init( TLOG_IGNORE_POP_AUTO_ENABLE_DELAY, 300.0 ); diff --git a/fdbserver/Knobs.h b/fdbserver/Knobs.h index 9a5f2a528c..5f91f0eff8 100644 --- a/fdbserver/Knobs.h +++ b/fdbserver/Knobs.h @@ -84,7 +84,7 @@ public: int64_t TLOG_SPILL_REFERENCE_MAX_BYTES_PER_BATCH; int64_t DISK_QUEUE_FILE_EXTENSION_BYTES; // When we grow the disk queue, by how many bytes should it grow? int64_t DISK_QUEUE_FILE_SHRINK_BYTES; // When we shrink the disk queue, by how many bytes should it shrink? - int DISK_QUEUE_MAX_TRUNCATE_BYTES; // A truncate larger than this will cause the file to be replaced instead. + int64_t DISK_QUEUE_MAX_TRUNCATE_BYTES; // A truncate larger than this will cause the file to be replaced instead. double TLOG_DEGRADED_DURATION; int64_t MAX_CACHE_VERSIONS; double TXS_POPPED_MAX_DELAY;