Added temp space to StorageBytes.

sfc-gh-satherton · sfc-gh-satherton · commit 5e6655f11134 · 2021-04-07T23:56:20.000-07:00
diff --git a/fdbclient/FDBTypes.h b/fdbclient/FDBTypes.h
@@ -866,27 +866,34 @@ struct TLogSpillType {
 
 // Contains the amount of free and total space for a storage server, in bytes
 struct StorageBytes {
+	// Free space on the filesystem
 	int64_t free;
+	// Total space on the filesystem
 	int64_t total;
-	int64_t used; // Used by *this* store, not total-free
-	int64_t available; // Amount of disk space that can be used by data structure, including free disk space and
-	                   // internally reusable space
+	// Used by *this* store, not total - free
+	int64_t used;
+	// Amount of space available for use by the store, which includes free space on the filesystem
+	// and internal free space within the store data that is immediately reusable.
+	int64_t available;
+	// Amount of space that could eventually be available for use after garbage collection
+	int64_t temp;
 
 	StorageBytes() {}
-	StorageBytes(int64_t free, int64_t total, int64_t used, int64_t available)
-	  : free(free), total(total), used(used), available(available) {}
+	StorageBytes(int64_t free, int64_t total, int64_t used, int64_t available, int64_t temp = 0)
+	  : free(free), total(total), used(used), available(available), temp(temp) {}
 
 	template <class Ar>
 	void serialize(Ar& ar) {
 		serializer(ar, free, total, used, available);
 	}
 
 	std::string toString() const {
-		return format("{%.2f MB total, %.2f MB free, %.2f MB available, %.2f MB used}",
+		return format("{%.2f MB total, %.2f MB free, %.2f MB available, %.2f MB used, %.2f MB temp}",
 		              total / 1e6,
 		              free / 1e6,
 		              available / 1e6,
-		              used / 1e6);
+		              used / 1e6,
+		              temp / 1e6);
 	}
 };
 struct LogMessageVersion {
diff --git a/fdbserver/VersionedBTree.actor.cpp b/fdbserver/VersionedBTree.actor.cpp
@@ -2111,8 +2111,9 @@ class DWALPager : public IPager2 {
 		// known, if each commit delayed entries that were freeable were shuffled from the delayed free queue to the
 		// free queue, but this doesn't seem necessary.
 		int64_t reusable = (freeList.numEntries + delayedFreeList.numEntries) * physicalPageSize;
+		int64_t temp = remapQueue.numEntries * physicalPageSize;
 
-		return StorageBytes(free, total, pagerSize - reusable, free + reusable);
+		return StorageBytes(free, total, pagerSize - reusable, free + reusable, temp);
 	}
 
 	ACTOR static Future<Void> getUserPageCount_cleanup(DWALPager* self) {

Original file line number	Diff line number	Diff line change
`@@ -2111,8 +2111,9 @@ class DWALPager : public IPager2 {`
`2111`	`2111`	`// known, if each commit delayed entries that were freeable were shuffled from the delayed free queue to the`
`2112`	`2112`	`// free queue, but this doesn't seem necessary.`
`2113`	`2113`	`int64_t reusable = (freeList.numEntries + delayedFreeList.numEntries) * physicalPageSize;`
	`2114`	`+ int64_t temp = remapQueue.numEntries * physicalPageSize;`
`2114`	`2115`
`2115`		`- return StorageBytes(free, total, pagerSize - reusable, free + reusable);`
	`2116`	`+ return StorageBytes(free, total, pagerSize - reusable, free + reusable, temp);`
`2116`	`2117`	`}`
`2117`	`2118`
`2118`	`2119`	`ACTOR static Future<Void> getUserPageCount_cleanup(DWALPager* self) {`