Merge pull request #185 from leil-io/release/v4.5.0

Main changes for Release v4.5.0: * fix(mount): Set default cacheExpirationTime to 0 (#180) * feat(mount): Add readcachemaxsize option (#145) * feat(master): Add empty reserved files option (#176) * fix(mount): Fix random case option parsing (#135) * feat(chunkserver): Add IDiskManager::getDiskForGC (#169) * test: Improve `stop_ganesha()` function (#168) * fix(ci): Modify timeout from env (#165) * ci: Fix tests behavior (#172) * fix(uraft): Fix missing floating ip address * fix(mount): Fix create time (Windows) (#167) * feat(admin): Add list-disk-groups command (#155) * ci: Abort previous concurrent tests * ci: Update de base docker image on build * fix(tests): Fix typo in setup-machine script * fix(tests): Amend upgrade tests (#146) * fix: Update services to wait for network (#151) * fix: Update uraft service to restart on failure (#153) * fix: Release compilation on GCC 14 (#148) * feat(chunkserver): Extend IDiskManager interface (#143) * test: Verify master loading legacy metadata * feat: Load legacy metadata file * fix: Allow legacy sessions download * fix: Allow legacy metadata download
leil-io · Sep 9, 2024 · e0a39ef · e0a39ef
2 parents 000e1bb + c2c96cd
commit e0a39ef
Show file tree

Hide file tree

Showing 80 changed files with 1,048 additions and 99 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -189,7 +189,7 @@ endif()
 project(saunafs)
 
 if(NOT PACKAGE_VERSION)
-  set(DEFAULT_MIN_VERSION "4.4.0")
+  set(DEFAULT_MIN_VERSION "4.5.0")
   execute_process(COMMAND "git" "rev-parse" "--short" "HEAD"
     OUTPUT_VARIABLE GIT_SHA1_SHORT RESULT_VARIABLE GIT_SHA1_SHORT_RETURN_VALUE
     OUTPUT_STRIP_TRAILING_WHITESPACE)

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -8,6 +8,7 @@ pipeline {
         ansiColor("xterm")
         parallelsAlwaysFailFast()
         preserveStashes(buildCount: 2)
+        disableConcurrentBuilds(abortPrevious: true)
     }
     stages {
         stage('Build Images') {

diff --git a/NEWS b/NEWS
@@ -1,5 +1,30 @@
 This file lists noteworthy changes in SaunaFS.
 
+ * SaunaFS (4.5.0) (2024-09-05)
+ - fix(mount): Set default cacheExpirationTime to 0 (#180)
+ - feat(mount): Add readcachemaxsize option (#145)
+ - feat(master): Add empty reserved files option (#176)
+ - fix(mount): Fix random case option parsing (#135)
+ - feat(chunkserver): Add IDiskManager::getDiskForGC (#169)
+ - test: Improve `stop_ganesha()` function (#168)
+ - fix(ci): Modify timeout from env (#165)
+ - ci: Fix tests behavior (#172)
+ - fix(uraft): Fix missing floating ip address
+ - fix(mount): Fix create time (Windows) (#167)
+ - feat(admin): Add list-disk-groups command (#155)
+ - ci: Abort previous concurrent tests
+ - ci: Update de base docker image on build
+ - fix(tests): Fix typo in setup-machine script
+ - fix(tests): Amend upgrade tests (#146)
+ - fix: Update services to wait for network (#151)
+ - fix: Update uraft service to restart on failure (#153)
+ - fix: Release compilation on GCC 14 (#148)
+ - feat(chunkserver): Extend IDiskManager interface (#143)
+ - test: Verify master loading legacy metadata
+ - feat: Load legacy metadata file
+ - fix: Allow legacy sessions download
+ - fix: Allow legacy metadata download
+
  * SaunaFS (4.4.0) (2024-07-31)
  - ci(.github): Add check for Conventional Commits (#131)
  - feat(metrics): Add initial prometheus support (#98)

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,30 @@
+saunafs (4.5.0) stable; urgency=medium
+  * fix(mount): Set default cacheExpirationTime to 0 (#180)
+  * feat(mount): Add readcachemaxsize option (#145)
+  * feat(master): Add empty reserved files option (#176)
+  * fix(mount): Fix random case option parsing (#135)
+  * feat(chunkserver): Add IDiskManager::getDiskForGC (#169)
+  * test: Improve `stop_ganesha()` function (#168)
+  * fix(ci): Modify timeout from env (#165)
+  * ci: Fix tests behavior (#172)
+  * fix(uraft): Fix missing floating ip address
+  * fix(mount): Fix create time (Windows) (#167)
+  * feat(admin): Add list-disk-groups command (#155)
+  * ci: Abort previous concurrent tests
+  * ci: Update de base docker image on build
+  * fix(tests): Fix typo in setup-machine script
+  * fix(tests): Amend upgrade tests (#146)
+  * fix: Update services to wait for network (#151)
+  * fix: Update uraft service to restart on failure (#153)
+  * fix: Release compilation on GCC 14 (#148)
+  * feat(chunkserver): Extend IDiskManager interface (#143)
+  * test: Verify master loading legacy metadata
+  * feat: Load legacy metadata file
+  * fix: Allow legacy sessions download
+  * fix: Allow legacy metadata download
+
+ -- SaunaFS Team <[email protected]>  Thu, 05 Sep 2024 14:23:04 +0000
+
 saunafs (4.4.0) stable; urgency=medium
   * ci(.github): Add check for Conventional Commits (#131)
   * feat(metrics): Add initial prometheus support (#98)

diff --git a/doc/sfsmount.1.adoc b/doc/sfsmount.1.adoc
@@ -157,11 +157,17 @@ operation in milliseconds (default: 2000).
 
 *-o cacheexpirationtime=*'MSEC'::
 Set timeout for read cache entries to be considered valid in milliseconds. 0
-disables cache (default: 0).
+disables cache (default: 0). Due to a bug, this can sometimes result in invalid
+data being returned if reading the mount point from multiple processes/threads
+and it's not disabled. Verify data being sent using a checksum if using this
+feature.
 
 *-o readaheadmaxwindowsize=*'KB'::
 Set max value of readahead window per single descriptor in kibibytes (default: 16384).
 
+*-o readcachemaxsize=*'MB'::
+Set max value of read cache size in mebibytes (default: 16384).
+
 *-o readworkers=*'N'::
 Define number of read workers (default: 30).
 
@@ -192,7 +198,7 @@ new session is created without password.
 Specify number of retries before I/O error is returned (default: 30).
 
 *-o sfsreportreservedperiod=*'N'::
-Specify interval of reporting reserved inodes in seconds (default: 60).
+Specify interval for reporting reserved inodes in seconds (default: 30).
 
 *-o sfsiolimits=*'PATH'::
 Specify local I/O limiting configuration file (default: no I/O limiting).

diff --git a/rpm/service-files/saunafs-cgiserv.service b/rpm/service-files/saunafs-cgiserv.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=SaunaFS CGI server daemon
 Documentation=man:saunafs-cgiserver
-After=network.target
+After=network-online.target network.target
 
 [Service]
 Environment=BIND_HOST=0.0.0.0

diff --git a/rpm/service-files/saunafs-chunkserver.service b/rpm/service-files/saunafs-chunkserver.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=SaunaFS chunkserver daemon
 Documentation=man:sfschunkserver
-After=network.target
+After=network-online.target network.target
 
 [Service]
 Type=forking

diff --git a/rpm/service-files/saunafs-ha-master.service b/rpm/service-files/saunafs-ha-master.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=SaunaFS master server daemon
-After=syslog.target network.target
+After=syslog.target network-online.target network.target
 PartOf=saunafs-uraft.service
 
 [Service]

diff --git a/rpm/service-files/saunafs-master.service b/rpm/service-files/saunafs-master.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=SaunaFS master server daemon
 Documentation=man:sfsmaster
-After=network.target
+After=network-online.target network.target
 
 [Service]
 Type=forking

diff --git a/rpm/service-files/saunafs-metalogger.service b/rpm/service-files/saunafs-metalogger.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=SaunaFS metalogger server daemon
 Documentation=man:sfsmetalogger
-After=network.target
+After=network-online.target network.target
 
 [Service]
 Type=forking

diff --git a/rpm/service-files/saunafs-uraft.service b/rpm/service-files/saunafs-uraft.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=SaunaFS uraft high availability daemon
 Requires=saunafs-ha-master.service
-After=network.target
+After=network-online.target network.target
 After=saunafs-ha-master.service
 
 [Service]
@@ -10,7 +10,8 @@ PIDFile=/var/run/saunafs-uraft.pid
 TimeoutSec=0
 ExecStart=/usr/sbin/saunafs-uraft
 ExecStopPost=/usr/sbin/saunafs-uraft-helper demote
-Restart=no
+Restart=on-failure
+RestartSec=60
 User=saunafs
 
 [Install]

diff --git a/src/admin/list_disk_groups_command.cc b/src/admin/list_disk_groups_command.cc
@@ -0,0 +1,98 @@
+/*
+   Copyright 2023 Leil Storage OÜ
+
+   This file is part of SaunaFS.
+
+   SaunaFS is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, version 3.
+
+   SaunaFS is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with SaunaFS. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "common/platform.h"
+
+#include <yaml-cpp/yaml.h>
+#include <iostream>
+
+#include "admin/list_chunkservers_command.h"
+#include "admin/list_disk_groups_command.h"
+#include "common/saunafs_version.h"
+#include "common/serialization.h"
+#include "common/server_connection.h"
+
+std::string ListDiskGroupsCommand::name() const { return "list-disk-groups"; }
+
+void ListDiskGroupsCommand::usage() const {
+	std::cerr << name() << " <master ip> <master port>\n";
+	std::cerr << "    Prints disk groups configuration in chunkservers.\n";
+}
+
+void ListDiskGroupsCommand::run(const Options &options) const {
+	if (options.arguments().size() != 2) {
+		throw WrongUsageException(
+		    "Expected <master ip> and <master port> for " + name());
+	}
+
+	auto chunkservers = ListChunkserversCommand::getChunkserversList(
+	    options.argument(0), options.argument(1));
+
+	YAML::Emitter yaml;
+	yaml << YAML::BeginMap;  // start root map
+
+	yaml << YAML::Key << "chunkservers";
+	yaml << YAML::Value << YAML::BeginSeq;  // start chunkservers list
+
+	for (const auto &chunkserver : chunkservers) {
+		if (chunkserver.version == kDisconnectedChunkserverVersion) {
+			continue;  // skip disconnected chunkservers
+		}
+
+		std::vector<uint8_t> request;
+		std::vector<uint8_t> response;
+		serializeLegacyPacket(request, CLTOCS_ADMIN_LIST_DISK_GROUPS);
+
+		auto csAddress =
+		    NetworkAddress(chunkserver.servip, chunkserver.servport);
+		ServerConnection connection(csAddress);
+		response = connection.sendAndReceive(request,
+		                                     CSTOCL_ADMIN_LIST_DISK_GROUPS);
+
+		std::string info;
+
+		try {
+			deserializeAllLegacyPacketDataNoHeader(response, info);
+		} catch (const IncorrectDeserializationException &e) {
+			std::cerr << e.what() << "\n";
+			continue;
+		}
+
+		yaml << YAML::BeginMap;  // start chunkserver map
+		yaml << YAML::Key << "chunkserver";
+		yaml << YAML::Value << csAddress.toString();
+
+		static constexpr const char *kDiskGroupsKey = "disk_groups";
+		yaml << YAML::Key << kDiskGroupsKey;
+
+		YAML::Node diskGroups = YAML::Load(info);
+
+		if (diskGroups.IsMap() && diskGroups[kDiskGroupsKey]) {
+			yaml << YAML::Value << diskGroups[kDiskGroupsKey];
+		} else {
+			yaml << YAML::Value << info;
+		}
+
+		yaml << YAML::EndMap;  // end chunkserver map
+	}
+
+	yaml << YAML::EndSeq;  // end chunkservers list
+	yaml << YAML::EndMap;  // end root map
+
+	std::cout << yaml.c_str() << "\n";
+}
diff --git a/src/admin/list_disk_groups_command.h b/src/admin/list_disk_groups_command.h
@@ -0,0 +1,30 @@
+/*
+   Copyright 2023 Leil Storage OÜ
+
+   This file is part of SaunaFS.
+
+   SaunaFS is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, version 3.
+
+   SaunaFS is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with SaunaFS. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "common/platform.h"
+
+#include "admin/saunafs_admin_command.h"
+
+class ListDiskGroupsCommand : public SaunaFsAdminCommand {
+public:
+	std::string name() const override;
+	void usage() const override;
+	void run(const Options& options) const override;
+};
diff --git a/src/admin/main.cc b/src/admin/main.cc
@@ -29,6 +29,7 @@
 #include "admin/list_chunkservers_command.h"
 #include "admin/list_defective_files_command.h"
 #include "admin/list_disks_command.h"
+#include "admin/list_disk_groups_command.h"
 #include "admin/list_goals_command.h"
 #include "admin/list_metadataservers_command.h"
 #include "admin/list_mounts_command.h"
@@ -58,6 +59,7 @@ int main(int argc, const char** argv) {
 			new ListChunkserversCommand(),
 			new ListDefectiveFilesCommand(),
 			new ListDisksCommand(),
+			new ListDiskGroupsCommand(),
 			new ListGoalsCommand(),
 			new ListMountsCommand(),
 			new ListMetadataserversCommand(),

diff --git a/src/chunkserver/chunkserver-common/default_disk_manager.cc b/src/chunkserver/chunkserver-common/default_disk_manager.cc
@@ -304,3 +304,31 @@ IDisk *DefaultDiskManager::getDiskForNewChunk(
 
 	return bestDisk;
 }
+
+IDisk *DefaultDiskManager::getDiskForGC() {
+	TRACETHIS();
+	IDisk *bestDisk = DiskNotFound;
+
+	std::lock_guard disksLockGuard(gDisksMutex);
+
+	if (gDisks.empty()) {
+		return DiskNotFound;
+	}
+
+	auto diskCount = gDisks.size();
+
+	for (size_t i = 0; i < diskCount; ++i) {
+		size_t index = (nextDiskIndexForGC_ + i) % diskCount;
+		const auto &disk = gDisks[index];
+
+		if (!disk->isZonedDevice() || !disk->isSelectableForNewChunk()) {
+			continue;
+		}
+
+		bestDisk = disk.get();
+		nextDiskIndexForGC_ = (index + 1) % diskCount;
+		break;
+	}
+
+	return bestDisk;
+}
diff --git a/src/chunkserver/chunkserver-common/default_disk_manager.h b/src/chunkserver/chunkserver-common/default_disk_manager.h
@@ -47,6 +47,11 @@ class DefaultDiskManager : public IDiskManager {
 	/// Virtual destructor needed for correct polymorphism
 	virtual ~DefaultDiskManager() = default;
 
+	/// Reload the configuration from the configuration file.
+	/// No need to reload the configuration so far for this implementation.
+	void reloadConfiguration() override {};
+
+	/// Parse a configuration line for a disk.
 	virtual int parseCfgLine(std::string hddCfgLine);
 
 	/// Reload the disks from the configuration and populates the gDisks vector.
@@ -60,4 +65,19 @@ class DefaultDiskManager : public IDiskManager {
 	 */
 	IDisk *getDiskForNewChunk(
 	    [[maybe_unused]] const ChunkPartType &chunkType) override;
+
+	/// Update the space usage of the disks.
+	/// No need to update the space usage here for this implementation.
+	void updateSpaceUsage() override {};
+
+	/// Gets the disk groups information.
+	/// Not supported by the default disk manager.
+	std::string getDiskGroupsInfo() override { return "Not supported"; }
+
+	/// Selects the disk to use for GC.
+	IDisk *getDiskForGC() override;
+
+private:
+	/// Next disk index for GC. Helps in the round-robin strategy.
+	uint32_t nextDiskIndexForGC_ = 0;
 };