Always set non-zero transient deadline, fixes #145.

cpp/shard/ShardDB.cpp

@@ -2598,10 +2598,7 @@ struct ShardDBImpl {
             v().setVersion(0);
             v().setFileSize(file().fileSize());
             v().setMtime(time);
-            v().setDeadline(0);
-            // TODO actually do the below if we end up doing in the kernel, right now I
-            // don't just because the tests fail otherwise.
-            // v().setDeadline(time + DEADLINE_INTERVAL); // we might use this to keep writing empty files
+            v().setDeadline(time + _transientDeadlineInterval);
             v().setLastSpanState(SpanState::CLEAN);
             v().setNoteDangerous(entry.name.ref());
             ROCKS_DB_CHECKED(batch.Put(_transientCf, k.toSlice(), v.toSlice()));
@@ -3123,7 +3120,7 @@ struct ShardDBImpl {
         transientFile().setVersion(0);
         transientFile().setFileSize(file().fileSize());
         transientFile().setMtime(time);
-        transientFile().setDeadline(0);
+        transientFile().setDeadline(time + _transientDeadlineInterval);
         transientFile().setLastSpanState(SpanState::CLEAN);
         transientFile().setNoteDangerous(entry.note.ref());
         ROCKS_DB_CHECKED(batch.Put(_transientCf, k.toSlice(), transientFile.toSlice()));

go/eggstests/cleanup.go

@@ -50,7 +50,6 @@ func cleanupAfterTest(
 	counters *lib.ClientCounters,
 	pauseBlockServiceKiller *sync.Mutex,
 ) {
-	cleanupStartedAt := time.Now()
 	client, err := lib.NewClient(log, nil, shuckleAddress)
 	if err != nil {
 		panic(err)
@@ -71,7 +70,7 @@ func cleanupAfterTest(
 		panic(err)
 	}
 	log.Info("waiting for transient deadlines to have passed")
-	time.Sleep(testTransientDeadlineInterval - time.Since(cleanupStartedAt))
+	time.Sleep(testTransientDeadlineInterval)
 	log.Info("deadlines passed, collecting")
 	{
 		state := &lib.DestructFilesState{}