diff --git a/sdk/go/dstack/client.go b/sdk/go/dstack/client.go index 5b72d8a9..cf0e081e 100644 --- a/sdk/go/dstack/client.go +++ b/sdk/go/dstack/client.go @@ -240,10 +240,12 @@ func (c *DstackClient) getEndpoint() string { c.logger.Info("using simulator endpoint", "endpoint", simEndpoint) return simEndpoint } - // Try new path first, fall back to old path for backward compatibility + // Try paths in order: legacy paths first, then namespaced paths socketPaths := []string{ - "/var/run/dstack/dstack.sock", "/var/run/dstack.sock", + "/run/dstack.sock", + "/var/run/dstack/dstack.sock", + "/run/dstack/dstack.sock", } for _, path := range socketPaths { if _, err := os.Stat(path); err == nil { diff --git a/sdk/go/tappd/client.go b/sdk/go/tappd/client.go index b3605abe..8a30a8bb 100644 --- a/sdk/go/tappd/client.go +++ b/sdk/go/tappd/client.go @@ -230,10 +230,12 @@ func (c *TappdClient) getEndpoint() string { c.logger.Info("using simulator endpoint", "endpoint", simEndpoint) return simEndpoint } - // Try new path first, fall back to old path for backward compatibility + // Try paths in order: legacy paths first, then namespaced paths socketPaths := []string{ - "/var/run/dstack/tappd.sock", "/var/run/tappd.sock", + "/run/tappd.sock", + "/var/run/dstack/tappd.sock", + "/run/dstack/tappd.sock", } for _, path := range socketPaths { if _, err := os.Stat(path); err == nil { diff --git a/sdk/js/src/index.ts b/sdk/js/src/index.ts index b43a8c67..03fa7836 100644 --- a/sdk/js/src/index.ts +++ b/sdk/js/src/index.ts @@ -179,10 +179,12 @@ export class DstackClient { console.warn(`Using simulator endpoint: ${process.env.DSTACK_SIMULATOR_ENDPOINT}`) endpoint = process.env.DSTACK_SIMULATOR_ENDPOINT } else { - // Try new path first, fall back to old path for backward compatibility + // Try paths in order: legacy paths first, then namespaced paths const socketPaths = [ - '/var/run/dstack/dstack.sock', '/var/run/dstack.sock', + '/run/dstack.sock', + '/var/run/dstack/dstack.sock', + '/run/dstack/dstack.sock', ] endpoint = socketPaths.find(p => fs.existsSync(p)) ?? socketPaths[0] } @@ -407,10 +409,12 @@ export class TappdClient extends DstackClient { console.warn(`Using tappd endpoint: ${process.env.TAPPD_SIMULATOR_ENDPOINT}`) endpoint = process.env.TAPPD_SIMULATOR_ENDPOINT } else { - // Try new path first, fall back to old path for backward compatibility + // Try paths in order: legacy paths first, then namespaced paths const socketPaths = [ - '/var/run/dstack/tappd.sock', '/var/run/tappd.sock', + '/run/tappd.sock', + '/var/run/dstack/tappd.sock', + '/run/dstack/tappd.sock', ] endpoint = socketPaths.find(p => fs.existsSync(p)) ?? socketPaths[0] } diff --git a/sdk/python/src/dstack_sdk/dstack_client.py b/sdk/python/src/dstack_sdk/dstack_client.py index 7fb79dc3..a78f9142 100644 --- a/sdk/python/src/dstack_sdk/dstack_client.py +++ b/sdk/python/src/dstack_sdk/dstack_client.py @@ -51,10 +51,12 @@ def get_endpoint(endpoint: str | None = None) -> str: f"Using simulator endpoint: {os.environ['DSTACK_SIMULATOR_ENDPOINT']}" ) return os.environ["DSTACK_SIMULATOR_ENDPOINT"] - # Try new path first, fall back to old path for backward compatibility + # Try paths in order: legacy paths first, then namespaced paths socket_paths = [ - "/var/run/dstack/dstack.sock", "/var/run/dstack.sock", + "/run/dstack.sock", + "/var/run/dstack/dstack.sock", + "/run/dstack/dstack.sock", ] for path in socket_paths: if os.path.exists(path): @@ -69,10 +71,12 @@ def get_tappd_endpoint(endpoint: str | None = None) -> str: if "TAPPD_SIMULATOR_ENDPOINT" in os.environ: logger.info(f"Using tappd endpoint: {os.environ['TAPPD_SIMULATOR_ENDPOINT']}") return os.environ["TAPPD_SIMULATOR_ENDPOINT"] - # Try new path first, fall back to old path for backward compatibility + # Try paths in order: legacy paths first, then namespaced paths socket_paths = [ - "/var/run/dstack/tappd.sock", "/var/run/tappd.sock", + "/run/tappd.sock", + "/var/run/dstack/tappd.sock", + "/run/dstack/tappd.sock", ] for path in socket_paths: if os.path.exists(path): diff --git a/sdk/rust/src/dstack_client.rs b/sdk/rust/src/dstack_client.rs index 48b4e6da..e72a986e 100644 --- a/sdk/rust/src/dstack_client.rs +++ b/sdk/rust/src/dstack_client.rs @@ -36,8 +36,13 @@ fn get_endpoint(endpoint: Option<&str>) -> String { if let Ok(sim_endpoint) = env::var("DSTACK_SIMULATOR_ENDPOINT") { return sim_endpoint; } - // Try new path first, fall back to old path for backward compatibility - const SOCKET_PATHS: &[&str] = &["/var/run/dstack/dstack.sock", "/var/run/dstack.sock"]; + // Try paths in order: legacy paths first, then namespaced paths + const SOCKET_PATHS: &[&str] = &[ + "/var/run/dstack.sock", + "/run/dstack.sock", + "/var/run/dstack/dstack.sock", + "/run/dstack/dstack.sock", + ]; for path in SOCKET_PATHS { if std::path::Path::new(path).exists() { return path.to_string(); diff --git a/sdk/rust/src/tappd_client.rs b/sdk/rust/src/tappd_client.rs index 769ff514..e313c52e 100644 --- a/sdk/rust/src/tappd_client.rs +++ b/sdk/rust/src/tappd_client.rs @@ -21,8 +21,13 @@ fn get_tappd_endpoint(endpoint: Option<&str>) -> String { if let Ok(sim_endpoint) = env::var("TAPPD_SIMULATOR_ENDPOINT") { return sim_endpoint; } - // Try new path first, fall back to old path for backward compatibility - const SOCKET_PATHS: &[&str] = &["/var/run/dstack/tappd.sock", "/var/run/tappd.sock"]; + // Try paths in order: legacy paths first, then namespaced paths + const SOCKET_PATHS: &[&str] = &[ + "/var/run/tappd.sock", + "/run/tappd.sock", + "/var/run/dstack/tappd.sock", + "/run/dstack/tappd.sock", + ]; for path in SOCKET_PATHS { if std::path::Path::new(path).exists() { return path.to_string();