chore(master): improve FS operations style (#658)

Main changes:
- Rename gFilesystemOperations to gFSOperations, which is shorter and 
  maintains the context.
- Rename the functions in IFilesystemOperation interface to match
  better our code style.

Signed-off-by: guillex <[email protected]>

Author: lgsilva3087

src/master/changelog.cc

@@ -313,14 +313,14 @@ void load_changelogs() {
 				uint64_t first = changelogGetFirstLogVersion(s);
 				uint64_t last = changelogGetLastLogVersion(s);
 				if (last >= first) {
-					if (last >= gFilesystemOperations->fs_getversion()) { load_changelog(s); }
+					if (last >= gFSOperations->getMetadataVersion()) { load_changelog(s); }
 				} else {
 					throw InitializeException(
 					    "changelog " + fullFileName +
 					    " inconsistent, "
 					    "use sfsmetarestore to recover the filesystem; "
 					    "current fs version: " +
-					    std::to_string(gFilesystemOperations->fs_getversion()) +
+					    std::to_string(gFSOperations->getMetadataVersion()) +
 					    ", first change in the file: " + std::to_string(first));
 				}
 			} else if (oldExists && s != kChangelogFilename) {
@@ -346,7 +346,7 @@ void load_changelog(const std::string &path) {
 	uint64_t appliedEntries = 0;
 	while (std::getline(changelog, line).good()) {
 		id = std::stoull(line, &end);
-		if (id < gFilesystemOperations->fs_getversion()) {
+		if (id < gFSOperations->getMetadataVersion()) {
 			++skippedEntries;
 			continue;
 		} else if (!first) {

src/master/chunks.cc

@@ -357,7 +357,7 @@ class Chunk {
 		Goal result;
 		int prev_goal = -1;
 		for (auto counter : goalCounters_) {
-			const Goal &goal = gFilesystemOperations->fs_get_goal_definition(counter.goal);
+			const Goal &goal = gFSOperations->getGoalDefinition(counter.goal);
 			if (prev_goal != (int)counter.goal) {
 				result.mergeIn(goal);
 				prev_goal = counter.goal;
@@ -823,7 +823,7 @@ void chunk_emergency_increase_version(Chunk *c) {
 	c->operation = Chunk::SET_VERSION;
 	c->version++;
 	chunk_update_checksum(c);
-	gFilesystemOperations->fs_incversion(c->chunkid);
+	gFSOperations->increaseChunkVersion(c->chunkid);
 	emit_chunk_changed(c);
 }
 
@@ -1105,7 +1105,7 @@ uint8_t chunk_multi_modify(uint64_t ochunkid, uint32_t *lockid, uint8_t goal,
 				return SAUNAFS_ERROR_NOCHUNKSERVERS;
 			}
 		}
-		ChunkCopiesCalculator calculator(gFilesystemOperations->fs_get_goal_definition(goal));
+		ChunkCopiesCalculator calculator(gFSOperations->getGoalDefinition(goal));
 		for (const auto &server_with_type : serversWithChunkTypes) {
 			calculator.addPart(server_with_type.second, MediaLabel::kWildcard);
 		}
@@ -1570,8 +1570,7 @@ void chunk_server_has_chunk(matocsserventry *ptr, uint64_t chunkid, uint32_t ver
 		// chunkserver has nonexistent chunk, so create it for future deletion
 		if (chunkid >= ChunksMetadata::getNextChunkId() &&
 		    gChunkIdGenerator->isStrictlyMonotonic()) {
-			gFilesystemOperations->fs_set_nextchunkid(FsContext::getForMaster(eventloop_time()),
-			                                          chunkid + 1);
+			gFSOperations->setNextChunkId(FsContext::getForMaster(eventloop_time()), chunkid + 1);
 		}
 		c = chunk_new(chunkid, new_version);
 		c->lockedto = (uint32_t)eventloop_time()+UNUSED_DELETE_TIMEOUT;

src/master/filesystem.cc

@@ -117,7 +117,7 @@ static void metadataPollServe(const std::vector<pollfd> &pdesc) {
 			if (dumper->useMetarestore()) {
 				// master should recalculate its checksum
 				safs_pretty_syslog(LOG_WARNING, "dumping metadata failed, recalculating checksum");
-				gFilesystemOperations->fs_start_checksum_recalculation();
+				gFSOperations->startChecksumRecalculation();
 			}
 			unlink(kMetadataTmpFilename);
 		}
@@ -229,9 +229,7 @@ static void ensureChunkIdGenerator() {
 }
 
 static void initFSOperations() {
-	if (!gFilesystemOperations) {
-		gFilesystemOperations = std::make_unique<FilesystemOperationsBase>();
-	}
+	if (!gFSOperations) { gFSOperations = std::make_unique<FilesystemOperationsBase>(); }
 }
 
 /* executed in master mode */
@@ -439,7 +437,7 @@ void fs_reload(void) {
 
 void fs_unload() {
 	safs_pretty_syslog(LOG_WARNING, "unloading filesystem at %" PRIu64,
-	                   gFilesystemOperations->fs_getversion());
+	                   gFSOperations->getMetadataVersion());
 	restore_reset();
 	matoclserv_session_unload();
 	chunk_unload();

src/master/filesystem_checksum_updater.h

@@ -54,9 +54,8 @@ class ChecksumUpdater {
 		lastEntry_ = gMetadata->metadataVersion;
 		if (metadataserver::isMaster() && !gChecksumBackgroundUpdater.inProgress()) {
 			std::string versionString = saunafsVersionToString(SAUNAFS_VERSHEX);
-			uint64_t checksum = gFilesystemOperations->fs_checksum(ChecksumMode::kGetCurrent);
-			gFilesystemOperations->fs_changelog(ts, "CHECKSUM(%s):%" PRIu64, versionString.c_str(),
-			                                    checksum);
+			uint64_t checksum = gFSOperations->metadataChecksum(ChecksumMode::kGetCurrent);
+			gFSOperations->changeLog(ts, "CHECKSUM(%s):%" PRIu64, versionString.c_str(), checksum);
 		}
 	}
 

src/master/filesystem_node.cc

@@ -148,7 +148,7 @@ static uint64_t file_realsize(FSNodeFile *node, uint32_t nonzero_chunks, uint64_
 	(void)file_size;
 	return 0; // Doesn't really matter. Metarestore doesn't need this value
 #else
-	const Goal &goal = gFilesystemOperations->fs_get_goal_definition(node->goal);
+	const Goal &goal = gFSOperations->getGoalDefinition(node->goal);
 
 	uint64_t full_size = 0;
 	for (const auto &slice : goal) {
@@ -1484,12 +1484,12 @@ uint8_t fsnodes_undel(uint32_t ts, FSNodeFile *node) {
 				assert(metadataserver::isMaster());
 #endif
 
-				gFilesystemOperations->fs_changelog(
-				    ts,
-				    "CREATE(%" PRIiNode ",%s,%c,%d,%" PRIu32 ",%" PRIu32 ",%" PRIu32 "):%" PRIiNode,
-				    p->id, fsnodes_escape_name(name).c_str(),
-				    static_cast<char>(FSNodeType::kDirectory), n->mode & 07777, (uint32_t)0,
-				    (uint32_t)0, (uint32_t)0, n->id);
+				gFSOperations->changeLog(ts,
+				                         "CREATE(%" PRIiNode ",%s,%c,%d,%" PRIu32 ",%" PRIu32
+				                         ",%" PRIu32 "):%" PRIiNode,
+				                         p->id, fsnodes_escape_name(name).c_str(),
+				                         static_cast<char>(FSNodeType::kDirectory), n->mode & 07777,
+				                         (uint32_t)0, (uint32_t)0, (uint32_t)0, n->id);
 			}
 			p = static_cast<FSNodeDirectory*>(n);
 			assert(n->type == FSNodeType::kDirectory);