Disable the local client per default and only make use of the external clients (#2303)

* Disable the local client per default and only make use of the external clients

Author: johscheuer

Dockerfile

@@ -106,7 +106,8 @@ USER 4059
 
 ENV FDB_NETWORK_OPTION_TRACE_LOG_GROUP=fdb-kubernetes-operator
 ENV FDB_NETWORK_OPTION_TRACE_ENABLE=/var/log/fdb
-ENV FDB_BINARY_DIR=/usr/bin/fdb
 ENV FDB_NETWORK_OPTION_EXTERNAL_CLIENT_DIRECTORY=/usr/bin/fdb
+ENV FDB_NETWORK_OPTION_DISABLE_LOCAL_CLIENT=""
+ENV FDB_BINARY_DIR=/usr/bin/fdb
 
 ENTRYPOINT ["/manager"]

api/v1beta2/foundationdb_env_variables.go

@@ -66,6 +66,9 @@ const (
 	// EnvNameFDBTraceLogDirPath enables trace logs output to a file in the given directory
 	EnvNameFDBTraceLogDirPath = "FDB_NETWORK_OPTION_TRACE_ENABLE"
 
+	// EnvNameFDBDisableLocalClient the name of the network option that allows to disable the local client.
+	EnvNameFDBDisableLocalClient = "FDB_NETWORK_OPTION_DISABLE_LOCAL_CLIENT"
+
 	// EnvNameFDBExternalClientDir specifies path to search for dynamic libraries and adds them to the list of client
 	// libraries for use by the multi-version client API. Must be set before setting up the network.
 	EnvNameFDBExternalClientDir = "FDB_NETWORK_OPTION_EXTERNAL_CLIENT_DIRECTORY"

e2e/fixtures/status.go

@@ -139,10 +139,11 @@ func (fdbCluster *FdbCluster) RunFdbCliCommandInOperatorWithoutRetry(
 			pod.Name,
 			"manager",
 			fmt.Sprintf(
-				"unset %s && unset %s && unset %s && TIMEFORMAT='%%R' && echo '%s' > %s && time %s --log-dir \"/var/log/fdb\" --log --trace_format \"json\" %s -C %s --exec '%s'",
+				"unset %s && unset %s && unset %s && unset %s && TIMEFORMAT='%%R' && echo '%s' > %s && time %s --log-dir \"/var/log/fdb\" --log --trace_format \"json\" %s -C %s --exec '%s'",
 				fdbv1beta2.EnvNameClientThreadsPerVersion,
 				fdbv1beta2.EnvNameFDBExternalClientDir,
 				fdbv1beta2.EnvNameFDBIgnoreExternalClientFailures,
+				fdbv1beta2.EnvNameFDBDisableLocalClient,
 				cluster.Status.ConnectionString,
 				clusterFile,
 				fdbCliPath,

fdbclient/command_runner.go

@@ -49,6 +49,7 @@ func getEnvironmentVariablesWithoutExcludedFdbEnv() []string {
 		fdbv1beta2.EnvNameFDBExternalClientDir:            {},
 		fdbv1beta2.EnvNameFDBIgnoreExternalClientFailures: {},
 		fdbv1beta2.EnvNameClientThreadsPerVersion:         {},
+		fdbv1beta2.EnvNameFDBDisableLocalClient:           {},
 	}
 
 	osVariables := os.Environ()