scalar: add --<verb>-cache-server-url options

Documentation/scalar.adoc

@@ -10,8 +10,8 @@ SYNOPSIS
 [verse]
 scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]
 	[--[no-]src] [--[no-]tags] [--[no-]maintenance]
-	[--[no-]src] [--local-cache-path <path>] [--cache-server-url <url>]
-	<url> [<enlistment>]
+	[--cache-server-url <url>] [--[verb]-cache-server-url <url>]
+	[--local-cache-path <path>] <url> [<enlistment>]
 scalar list
 scalar register [--[no-]maintenance] [<enlistment>]
 scalar unregister [<enlistment>]
@@ -121,6 +121,11 @@ clone), and `~/.scalarCache` on macOS.
 	Retrieve missing objects from the specified remote, which is expected to
 	understand the GVFS protocol.
 
+--[verb]-cache-server-url <url>::
+	Set the appropriate `gvfs.<verb>.cache-server` config value that overrides
+	the provided `--cache-server-url` or the dynamically discovered URL. The
+	list of allowed verbs is `prefetch`, `get`, and `post`.
+
 --gvfs-protocol::
 --no-gvfs-protocol::
 	When cloning from a `<url>` with either `dev.azure.com` or

scalar.c

@@ -783,6 +783,7 @@ static int cmd_clone(int argc, const char **argv)
 	int src = 1, tags = 1, maintenance = 1;
 	const char *cache_server_url = NULL, *local_cache_root = NULL;
 	char *default_cache_server_url = NULL, *local_cache_root_abs = NULL;
+	const char *prefetch_server = NULL, *get_server = NULL, *post_server = NULL;
 	int gvfs_protocol = -1;
 	const char *ref_format = NULL;
 
@@ -805,6 +806,15 @@ static int cmd_clone(int argc, const char **argv)
 		OPT_STRING(0, "cache-server-url", &cache_server_url,
 			   N_("<url>"),
 			   N_("the url or friendly name of the cache server")),
+		OPT_STRING(0, "prefetch-cache-server-url", &prefetch_server,
+			   N_("<url>"),
+			   N_("the url or friendly name of a cache server for the prefetch endpoint")),
+		OPT_STRING(0, "get-cache-server-url", &get_server,
+			   N_("<url>"),
+			   N_("the url or friendly name of a cache server for the objects GET endpoint")),
+		OPT_STRING(0, "post-cache-server-url", &post_server,
+			   N_("<url>"),
+			   N_("the url or friendly name of a cache server for the objects POST endpoint")),
 		OPT_STRING(0, "local-cache-path", &local_cache_root,
 			   N_("<path>"),
 			   N_("override the path for the local Scalar cache")),
@@ -817,7 +827,8 @@ static int cmd_clone(int argc, const char **argv)
 	const char * const clone_usage[] = {
 		N_("scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
 		   "\t[--[no-]src] [--[no-]tags] [--[no-]maintenance] [--ref-format <format>]\n"
-		   "\t<url> [<enlistment>]"),
+		   "\t[--cache-server-url <url>] [--[verb]-cache-server-url <url>]\n"
+		   "\t[--local-cache-path <path>] <url> [<enlistment>]"),
 		NULL
 	};
 	const char *url;
@@ -979,6 +990,33 @@ static int cmd_clone(int argc, const char **argv)
 		if (cache_server_url)
 			fprintf(stderr, "Cache server URL: %s\n",
 				cache_server_url);
+
+		if (prefetch_server &&
+		    set_config("gvfs.prefetch.cache-server=%s", prefetch_server)) {
+			res = error(_("could not configure prefetch cache server"));
+			goto cleanup;
+		}
+		if (prefetch_server)
+			fprintf(stderr, "Prefetch cache server URL: %s\n",
+				prefetch_server);
+
+		if (get_server &&
+		    set_config("gvfs.get.cache-server=%s", get_server)) {
+			res = error(_("could not configure objects GET cache server"));
+			goto cleanup;
+		}
+		if (get_server)
+			fprintf(stderr, "Objects GET cache server URL: %s\n",
+				get_server);
+
+		if (post_server &&
+		    set_config("gvfs.post.cache-server=%s", post_server)) {
+			res = error(_("could not configure objects POST cache server"));
+			goto cleanup;
+		}
+		if (post_server)
+			fprintf(stderr, "Objects POST cache server URL: %s\n",
+				post_server);
 	} else {
 		if (set_config("core.useGVFSHelper=false") ||
 		    set_config("remote.origin.promisor=true") ||

t/lib-gvfs-helper.sh

@@ -58,8 +58,8 @@ SHARED_CACHE_T2="$(pwd)"/shared_cache_t2
 # The server will shut down if/when we delete it.  (This is a little
 # easier than killing it by PID.)
 #
-PID_FILE="$(pwd)"/pid-file.pid
-SERVER_LOG="$(pwd)"/OUT.server.log
+PID_FILE="$(pwd)"/pid-file-gvfs.pid
+SERVER_LOG="$(pwd)"/OUT.gvfs.server.log
 
 # Helper functions to compute port, pid-file, and log for a given
 # port increment. An increment of 0 (or empty) uses the base values.
@@ -294,7 +294,7 @@ stop_gvfs_protocol_server () {
 	# port before the next test start another instance and it attempts to
 	# bind to it).
 	#
-	for k in 0 1 2 3 4
+	for k in $(test_seq 5)
 	do
 		if grep -q "Starting graceful shutdown" "$log_file"
 		then
@@ -334,7 +334,7 @@ start_gvfs_protocol_server () {
 	#
 	# Give it a few seconds to get started.
 	#
-	for k in 0 1 2 3 4
+	for k in $(test_seq 5)
 	do
 		if test -f "$pid_file"
 		then
@@ -375,7 +375,7 @@ start_gvfs_protocol_server_with_mayhem () {
 	#
 	# Give it a few seconds to get started.
 	#
-	for k in 0 1 2 3 4
+	for k in $(test_seq 5)
 	do
 		if test -f "$PID_FILE"
 		then

t/t9210-scalar.sh

@@ -360,28 +360,28 @@ test_expect_success UNZIP 'scalar diagnose' '
 GIT_TEST_ALLOW_GVFS_VIA_HTTP=1
 export GIT_TEST_ALLOW_GVFS_VIA_HTTP
 
-test_set_port GIT_TEST_GVFS_PROTOCOL_PORT
-HOST_PORT=127.0.0.1:$GIT_TEST_GVFS_PROTOCOL_PORT
-PID_FILE="$(pwd)"/pid-file.pid
-SERVER_LOG="$(pwd)"/OUT.server.log
+test_set_port GIT_TEST_GVFS_PROTOCOL_ORIGIN_PORT
+ORIGIN_HOST_PORT=127.0.0.1:$GIT_TEST_GVFS_PROTOCOL_ORIGIN_PORT
+ORIGIN_PID_FILE="$(pwd)"/pid-file.$GIT_TEST_GVFS_PROTOCOL_ORIGIN_PORT.pid
+ORIGIN_SERVER_LOG="$(pwd)"/OUT.server.$GIT_TEST_GVFS_PROTOCOL_ORIGIN_PORT.log
 
 test_atexit '
-	test -f "$PID_FILE" || return 0
+	test -f "$ORIGIN_PID_FILE" || return 0
 
 	# The server will shutdown automatically when we delete the pid-file.
-	rm -f "$PID_FILE"
+	rm -f "$ORIGIN_PID_FILE"
 
 	test -z "$verbose$verbose_log" || {
 		echo "server log:"
-		cat "$SERVER_LOG"
+		cat "$ORIGIN_SERVER_LOG"
 	}
 
 	# Give it a few seconds to shutdown (mainly to completely release the
 	# port before the next test start another instance and it attempts to
 	# bind to it).
 	for k in $(test_seq 5)
 	do
-		grep -q "Starting graceful shutdown" "$SERVER_LOG" &&
+		grep -q "Starting graceful shutdown" "$ORIGIN_SERVER_LOG" &&
 		return 0 ||
 		sleep 1
 	done
@@ -394,14 +394,14 @@ start_gvfs_enabled_http_server () {
 	GIT_HTTP_EXPORT_ALL=1 \
 	test-gvfs-protocol --verbose \
 		--listen=127.0.0.1 \
-		--port=$GIT_TEST_GVFS_PROTOCOL_PORT \
+		--port=$GIT_TEST_GVFS_PROTOCOL_ORIGIN_PORT \
 		--reuseaddr \
-		--pid-file="$PID_FILE" \
-		2>"$SERVER_LOG" &
+		--pid-file="$ORIGIN_PID_FILE" \
+		2>"$ORIGIN_SERVER_LOG" &
 
-	for k in 0 1 2 3 4
+	for k in $(test_seq 5)
 	do
-		if test -f "$PID_FILE"
+		if test -f "$ORIGIN_PID_FILE"
 		then
 			return 0
 		fi
@@ -426,20 +426,20 @@ test_expect_success '`scalar clone` with GVFS-enabled server' '
 	GIT_TRACE2_EVENT="$(pwd)/clone-trace-with-gvfs" scalar \
 		-c credential.interactive=true \
 		clone --gvfs-protocol \
-		--single-branch -- http://$HOST_PORT/ using-gvfs &&
+		--single-branch -- http://$ORIGIN_HOST_PORT/ using-gvfs &&
 
 	grep "GET/config(main)" <clone-trace-with-gvfs &&
 
 	: verify that the shared cache has been configured &&
-	cache_key="url_$(printf "%s" http://$HOST_PORT/ |
+	cache_key="url_$(printf "%s" http://$ORIGIN_HOST_PORT/ |
 		tr A-Z a-z |
 		test-tool sha1)" &&
 	echo "$(pwd)/.scalarCache/$cache_key" >expect &&
 	git -C using-gvfs/src config gvfs.sharedCache >actual &&
 	test_cmp expect actual &&
 
 	: verify that URL-specific HTTP version setting is configured for GVFS URLs in clone &&
-	git -C using-gvfs/src config "http.http://$HOST_PORT/.version" >actual &&
+	git -C using-gvfs/src config "http.http://$ORIGIN_HOST_PORT/.version" >actual &&
 	echo "HTTP/1.1" >expect &&
 	test_cmp expect actual &&
 
@@ -455,7 +455,52 @@ test_expect_success '`scalar clone` with GVFS-enabled server' '
 	)
 '
 
-test_expect_success 'fetch <non-existent> does not hang in gvfs-helper' '
+. "$TEST_DIRECTORY"/lib-gvfs-helper.sh
+
+test_expect_success 'scalar clone: all verbs with different servers' '
+	git config --global core.askPass true &&
+
+	test_when_finished "per_test_cleanup" &&
+	test_when_finished "scalar delete scalar-clone" &&
+
+	start_gvfs_protocol_server 1 &&
+	start_gvfs_protocol_server 2 &&
+	start_gvfs_protocol_server 3 &&
+	start_gvfs_protocol_server 4 &&
+
+	# Configure each verb to use a different server:
+	# - server 1: default (unused in this test; not running.)
+	# - server 2: prefetch
+	# - server 3: get
+	# - server 4: post
+	scalar -c credential.interactive=true \
+			clone --full-clone \
+			 --cache-server-url="$(cache_server_url 1)" \
+		     --prefetch-cache-server-url="$(cache_server_url 2)" \
+		     --get-cache-server-url="$(cache_server_url 3)" \
+		     --post-cache-server-url="$(cache_server_url 4)" \
+			 --gvfs-protocol \
+		     -- "http://$ORIGIN_HOST_PORT/" scalar-clone 2>err >out &&
+
+	test_grep "Cache server URL: $(cache_server_url 1)" err &&
+	test_grep "Prefetch cache server URL: $(cache_server_url 2)" err &&
+	test_grep "Objects GET cache server URL: $(cache_server_url 3)" err &&
+	test_grep "Objects POST cache server URL: $(cache_server_url 4)" err &&
+
+	test_cmp_config -C scalar-clone/src "$(cache_server_url 1)" gvfs.cache-server &&
+	test_cmp_config -C scalar-clone/src "$(cache_server_url 2)" gvfs.prefetch.cache-server &&
+	test_cmp_config -C scalar-clone/src "$(cache_server_url 3)" gvfs.get.cache-server &&
+	test_cmp_config -C scalar-clone/src "$(cache_server_url 4)" gvfs.post.cache-server &&
+
+	verify_server_was_contacted 1 &&
+	verify_server_was_contacted 2 &&
+	verify_server_was_contacted 3
+'
+
+test_expect_success EXPENSIVE 'fetch <non-existent> does not hang in gvfs-helper' '
+	# Marked as EXPENSIVE as this will go through multiple rounds of
+	# exponential backoff, including delays of 8, 16, 32, 64, 128,
+	# and 256 seconds in two separate instances.
 	test_must_fail git -C using-gvfs/src fetch origin does-not-exist
 '
 
@@ -469,7 +514,7 @@ test_expect_success '`scalar clone --no-gvfs-protocol` skips gvfs/config' '
 	GIT_TRACE2_EVENT="$(pwd)/clone-trace-no-gvfs" scalar \
 		-c credential.interactive=true \
 		clone --no-gvfs-protocol \
-		--single-branch -- http://$HOST_PORT/ skipping-gvfs &&
+		--single-branch -- http://$ORIGIN_HOST_PORT/ skipping-gvfs &&
 
 	! grep "GET/config(main)" <clone-trace-no-gvfs &&
 	! git -C skipping-gvfs/src config core.gvfs &&
@@ -564,11 +609,11 @@ test_expect_success 'scalar cache-server basics' '
 test_expect_success 'scalar cache-server list URL' '
 	repo=with-real-gvfs &&
 	git init $repo &&
-	git -C $repo remote add origin http://$HOST_PORT/ &&
+	git -C $repo remote add origin http://$ORIGIN_HOST_PORT/ &&
 	scalar cache-server --list origin $repo >out &&
 
 	cat >expect <<-EOF &&
-	#0: http://$HOST_PORT/servertype/cache
+	#0: http://$ORIGIN_HOST_PORT/servertype/cache
 	EOF
 
 	test_cmp expect out &&