From e48ab69c6b2f9f58f1059aad4066587b9768e147 Mon Sep 17 00:00:00 2001
From: Vaidas Gasiunas <vaidas.gasiunas@snowflake.com>
Date: Thu, 21 Apr 2022 18:53:08 +0200
Subject: [PATCH 1/6] An option to specify a custom directory for temporary
 client library copies

---
 fdbclient/MultiVersionTransaction.actor.cpp | 8 ++++++--
 fdbclient/MultiVersionTransaction.h         | 1 +
 fdbclient/vexillographer/fdb.options        | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/fdbclient/MultiVersionTransaction.actor.cpp b/fdbclient/MultiVersionTransaction.actor.cpp
index 94d27eded3..ae8432469b 100644
--- a/fdbclient/MultiVersionTransaction.actor.cpp
+++ b/fdbclient/MultiVersionTransaction.actor.cpp
@@ -1996,8 +1996,9 @@ std::vector<std::pair<std::string, bool>> MultiVersionApi::copyExternalLibraryPe
 		for (int ii = 0; ii < threadCount; ++ii) {
 			std::string filename = basename(path);
 
-			char tempName[PATH_MAX + 12];
-			sprintf(tempName, "/tmp/%s-XXXXXX", filename.c_str());
+			constexpr int MAX_TMP_NAME_LENGTH = PATH_MAX + 12;
+			char tempName[MAX_TMP_NAME_LENGTH];
+			snprintf(tempName, MAX_TMP_NAME_LENGTH, "%s/%s-XXXXXX", tmpDir.c_str(), filename.c_str());
 			int tempFd = mkstemp(tempName);
 			int fd;
 
@@ -2143,6 +2144,9 @@ void MultiVersionApi::setNetworkOptionInternal(FDBNetworkOptions::Option option,
 		// multiple client threads are not supported on windows.
 		threadCount = extractIntOption(value, 1, 1);
 #endif
+	} else if (option == FDBNetworkOptions::CLIENT_TMP_DIR) {
+		validateOption(value, true, false, false);
+		tmpDir = abspath(value.get().toString());
 	} else {
 		forwardOption = true;
 	}
diff --git a/fdbclient/MultiVersionTransaction.h b/fdbclient/MultiVersionTransaction.h
index bf8bc11d13..1fb5c604ff 100644
--- a/fdbclient/MultiVersionTransaction.h
+++ b/fdbclient/MultiVersionTransaction.h
@@ -898,6 +898,7 @@ private:
 
 	int nextThread = 0;
 	int threadCount;
+	std::string tmpDir;
 
 	Mutex lock;
 	std::vector<std::pair<FDBNetworkOptions::Option, Optional<Standalone<StringRef>>>> options;
diff --git a/fdbclient/vexillographer/fdb.options b/fdbclient/vexillographer/fdb.options
index 9f2f9e52f9..cafa0cc402 100644
--- a/fdbclient/vexillographer/fdb.options
+++ b/fdbclient/vexillographer/fdb.options
@@ -134,6 +134,9 @@ description is not currently required but encouraged.
     <Option name="distributed_client_tracer" code="90"
             paramType="String" paramDescription="Distributed tracer type. Choose from none, log_file, or network_lossy"
             description="Set a tracer to run on the client. Should be set to the same value as the tracer set on the server." />
+    <Option name="client_tmp_dir" code="90"
+            paramType="String" paramDescription="Client directory for temporary files. "
+            description="Sets the directory for storing temporary files created by FDB client, such as temporary copies of client libraries. Defaults to /tmp" />
     <Option name="supported_client_versions" code="1000"
             paramType="String" paramDescription="[release version],[source version],[protocol version];..."
             description="This option is set automatically to communicate the list of supported clients to the active client."

From b4fa9e23f6e073990623191dde1fcec962cb278a Mon Sep 17 00:00:00 2001
From: Vaidas Gasiunas <vaidas.gasiunas@snowflake.com>
Date: Thu, 21 Apr 2022 19:25:43 +0200
Subject: [PATCH 2/6] Upgrade Tests: Use build local tmp directory for temp
 client library copies

---
 bindings/c/test/apitester/TesterOptions.h      |  2 ++
 bindings/c/test/apitester/fdb_c_api_tester.cpp | 10 ++++++++++
 tests/TestRunner/upgrade_test.py               |  1 +
 3 files changed, 13 insertions(+)

diff --git a/bindings/c/test/apitester/TesterOptions.h b/bindings/c/test/apitester/TesterOptions.h
index 4e448f1222..09a9ccc13a 100644
--- a/bindings/c/test/apitester/TesterOptions.h
+++ b/bindings/c/test/apitester/TesterOptions.h
@@ -38,6 +38,8 @@ public:
 	std::string logGroup;
 	std::string externalClientLibrary;
 	std::string externalClientDir;
+	std::string tmpDir;
+	std::string clientTmpDir;
 	bool disableLocalClient = false;
 	std::string testFile;
 	std::string inputPipeName;
diff --git a/bindings/c/test/apitester/fdb_c_api_tester.cpp b/bindings/c/test/apitester/fdb_c_api_tester.cpp
index a3de942226..0313031cfd 100644
--- a/bindings/c/test/apitester/fdb_c_api_tester.cpp
+++ b/bindings/c/test/apitester/fdb_c_api_tester.cpp
@@ -46,6 +46,7 @@ enum TesterOptionId {
 	OPT_KNOB,
 	OPT_EXTERNAL_CLIENT_LIBRARY,
 	OPT_EXTERNAL_CLIENT_DIRECTORY,
+	OPT_TMP_DIR,
 	OPT_DISABLE_LOCAL_CLIENT,
 	OPT_TEST_FILE,
 	OPT_INPUT_PIPE,
@@ -66,6 +67,7 @@ CSimpleOpt::SOption TesterOptionDefs[] = //
 	  { OPT_KNOB, "--knob-", SO_REQ_SEP },
 	  { OPT_EXTERNAL_CLIENT_LIBRARY, "--external-client-library", SO_REQ_SEP },
 	  { OPT_EXTERNAL_CLIENT_DIRECTORY, "--external-client-dir", SO_REQ_SEP },
+	  { OPT_TMP_DIR, "--tmp-dir", SO_REQ_SEP },
 	  { OPT_DISABLE_LOCAL_CLIENT, "--disable-local-client", SO_NONE },
 	  { OPT_TEST_FILE, "-f", SO_REQ_SEP },
 	  { OPT_TEST_FILE, "--test-file", SO_REQ_SEP },
@@ -98,6 +100,8 @@ void printProgramUsage(const char* execName) {
 	       "                 Path to the external client library.\n"
 	       "  --external-client-dir DIR\n"
 	       "                 Directory containing external client libraries.\n"
+	       "  --tmp-dir DIR\n"
+	       "                 Directory for temporary files of the client.\n"
 	       "  --disable-local-client DIR\n"
 	       "                 Disable the local client, i.e. use only external client libraries.\n"
 	       "  --input-pipe NAME\n"
@@ -180,6 +184,9 @@ bool processArg(TesterOptions& options, const CSimpleOpt& args) {
 	case OPT_EXTERNAL_CLIENT_DIRECTORY:
 		options.externalClientDir = args.OptionArg();
 		break;
+	case OPT_TMP_DIR:
+		options.tmpDir = args.OptionArg();
+		break;
 	case OPT_DISABLE_LOCAL_CLIENT:
 		options.disableLocalClient = true;
 		break;
@@ -236,6 +243,9 @@ void fdb_check(fdb_error_t e) {
 }
 
 void applyNetworkOptions(TesterOptions& options) {
+	if (!options.tmpDir.empty()) {
+		fdb_check(FdbApi::setOption(FDBNetworkOption::FDB_NET_OPTION_CLIENT_TMP_DIR, options.tmpDir));
+	}
 	if (!options.externalClientLibrary.empty()) {
 		fdb_check(FdbApi::setOption(FDBNetworkOption::FDB_NET_OPTION_DISABLE_LOCAL_CLIENT));
 		fdb_check(
diff --git a/tests/TestRunner/upgrade_test.py b/tests/TestRunner/upgrade_test.py
index 2f63fb8a51..3981b2d991 100755
--- a/tests/TestRunner/upgrade_test.py
+++ b/tests/TestRunner/upgrade_test.py
@@ -246,6 +246,7 @@ class UpgradeTest:
                         '--api-version', str(self.api_version),
                         '--log',
                         '--log-dir', self.log,
+                        '--tmp-dir', self.tmp_dir,
                         '--transaction-retry-limit', str(TRANSACTION_RETRY_LIMIT)]
             if (RUN_WITH_GDB):
                 cmd_args = ['gdb', '-ex', 'run', '--args'] + cmd_args

From 444b6c5479bc7f44abd80ad28b788c24c24b6bea Mon Sep 17 00:00:00 2001
From: Vaidas Gasiunas <vaidas.gasiunas@snowflake.com>
Date: Fri, 22 Apr 2022 11:44:44 +0200
Subject: [PATCH 3/6] Default the client temp directory to /tmp

---
 fdbclient/MultiVersionTransaction.actor.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fdbclient/MultiVersionTransaction.actor.cpp b/fdbclient/MultiVersionTransaction.actor.cpp
index ae8432469b..5dd31fde1c 100644
--- a/fdbclient/MultiVersionTransaction.actor.cpp
+++ b/fdbclient/MultiVersionTransaction.actor.cpp
@@ -2522,7 +2522,8 @@ void MultiVersionApi::loadEnvironmentVariableNetworkOptions() {
 
 MultiVersionApi::MultiVersionApi()
   : callbackOnMainThread(true), localClientDisabled(false), networkStartSetup(false), networkSetup(false),
-    bypassMultiClientApi(false), externalClient(false), apiVersion(0), threadCount(0), envOptionsLoaded(false) {}
+    bypassMultiClientApi(false), externalClient(false), apiVersion(0), threadCount(0), tmpDir("/tmp"),
+    envOptionsLoaded(false) {}
 
 MultiVersionApi* MultiVersionApi::api = new MultiVersionApi();
 

From f9cb9deb1d3a241d73d8e22954ee6dd275af5493 Mon Sep 17 00:00:00 2001
From: Vaidas Gasiunas <vaidas.gasiunas@snowflake.com>
Date: Fri, 22 Apr 2022 11:57:29 +0200
Subject: [PATCH 4/6] Use build-local temp directory for C API tests

---
 bindings/c/CMakeLists.txt                    | 2 ++
 bindings/c/test/apitester/run_c_api_tests.py | 9 +++++++--
 tests/TestRunner/tmp_cluster.py              | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt
index dce7604936..6190256ff6 100644
--- a/bindings/c/CMakeLists.txt
+++ b/bindings/c/CMakeLists.txt
@@ -251,6 +251,8 @@ endif()
             ${CMAKE_CURRENT_BINARY_DIR}/libfdb_c_external.so
             --test-dir
             ${CMAKE_SOURCE_DIR}/bindings/c/test/apitester/tests
+            --tmp-dir
+            @TMP_DIR@
             )
 
   if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT USE_SANITIZER)
diff --git a/bindings/c/test/apitester/run_c_api_tests.py b/bindings/c/test/apitester/run_c_api_tests.py
index 8f79e6d8b1..dd81cf7079 100755
--- a/bindings/c/test/apitester/run_c_api_tests.py
+++ b/bindings/c/test/apitester/run_c_api_tests.py
@@ -49,10 +49,13 @@ def initialize_logger_level(logging_level):
 
 
 def run_tester(args, test_file):
-    cmd = [args.tester_binary, "--cluster-file",
-           args.cluster_file, "--test-file", test_file]
+    cmd = [args.tester_binary,
+           "--cluster-file", args.cluster_file,
+           "--test-file", test_file]
     if args.external_client_library is not None:
         cmd += ["--external-client-library", args.external_client_library]
+    if args.tmp_dir is not None:
+        cmd += ["--tmp-dir", args.tmp_dir]
 
     get_logger().info('\nRunning tester \'%s\'...' % ' '.join(cmd))
     proc = Popen(cmd, stdout=sys.stdout, stderr=sys.stderr)
@@ -111,6 +114,8 @@ def parse_args(argv):
                         help='The timeout in seconds for running each individual test. (default 300)')
     parser.add_argument('--logging-level', type=str, default='INFO',
                         choices=['ERROR', 'WARNING', 'INFO', 'DEBUG'], help='Specifies the level of detail in the tester output (default=\'INFO\').')
+    parser.add_argument('--tmp-dir', type=str, default=None,
+                        help='The directory for storing temporary files (default: None)')
 
     return parser.parse_args(argv)
 
diff --git a/tests/TestRunner/tmp_cluster.py b/tests/TestRunner/tmp_cluster.py
index faa221f6da..17c5d2cb34 100755
--- a/tests/TestRunner/tmp_cluster.py
+++ b/tests/TestRunner/tmp_cluster.py
@@ -105,6 +105,8 @@ if __name__ == "__main__":
                 cmd_args.append(str(cluster.log))
             elif cmd == "@ETC_DIR@":
                 cmd_args.append(str(cluster.etc))
+            elif cmd == "@TMP_DIR@":
+                cmd_args.append(str(cluster.tmp_dir))
             else:
                 cmd_args.append(cmd)
         env = dict(**os.environ)

From bc0096683ffbb8183dfc35249718c4abc1af5b2a Mon Sep 17 00:00:00 2001
From: Vaidas Gasiunas <vaidas.gasiunas@snowflake.com>
Date: Fri, 22 Apr 2022 14:14:09 +0200
Subject: [PATCH 5/6] Remove an unused class member

---
 bindings/c/test/apitester/TesterOptions.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bindings/c/test/apitester/TesterOptions.h b/bindings/c/test/apitester/TesterOptions.h
index c960ddbf72..1074843fad 100644
--- a/bindings/c/test/apitester/TesterOptions.h
+++ b/bindings/c/test/apitester/TesterOptions.h
@@ -39,7 +39,6 @@ public:
 	std::string externalClientLibrary;
 	std::string externalClientDir;
 	std::string tmpDir;
-	std::string clientTmpDir;
 	bool disableLocalClient = false;
 	std::string testFile;
 	std::string inputPipeName;

From 1064035c46e1f74f163667b153a786923f4eddbf Mon Sep 17 00:00:00 2001
From: Vaidas Gasiunas <vaidas.gasiunas@snowflake.com>
Date: Fri, 22 Apr 2022 14:33:18 +0200
Subject: [PATCH 6/6] Update generated.go to include the client_tmp_dir option

---
 bindings/go/src/fdb/generated.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bindings/go/src/fdb/generated.go b/bindings/go/src/fdb/generated.go
index b636484408..aa6be19289 100644
--- a/bindings/go/src/fdb/generated.go
+++ b/bindings/go/src/fdb/generated.go
@@ -285,6 +285,13 @@ func (o NetworkOptions) SetDistributedClientTracer(param string) error {
 	return o.setOpt(90, []byte(param))
 }
 
+// Sets the directory for storing temporary files created by FDB client, such as temporary copies of client libraries. Defaults to /tmp
+//
+// Parameter: Client directory for temporary files. 
+func (o NetworkOptions) SetClientTmpDir(param string) error {
+	return o.setOpt(90, []byte(param))
+}
+
 // Set the size of the client location cache. Raising this value can boost performance in very large databases where clients access data in a near-random pattern. Defaults to 100000.
 //
 // Parameter: Max location cache entries