Rollback of commit feb1321044e3b7be34f9c1d7dacf9881d99a7327.

*** Reason for rollback ***

Underlying issue fixed in commit 5b12f6e759c1f3137a7149d3026ff96686d07696

*** Original change description ***

Automated [] rollback of commit a3381b6ac136a0cab3ba86020c739fe16b42cee9.

*** Reason for rollback ***

Broke bazel_rules_test

See https://github.com/bazelbuild/bazel/issues/1501.

*** Original change description ***


Fix default for temporary directories to honor TMPDIR

...and only use the hard-coded "/tmp" as default for the default.
Note that is unchanged that blaze.rpcserver.tmpdir still overrides.

--
MOS_MIGRATED_REVID=127201018

1 files changed, 8 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/server/AfUnixServer.java b/src/main/java/com/google/devtools/build/lib/server/AfUnixServer.java
index f615d04cd7..8c5d316210 100644
--- a/src/main/java/com/google/devtools/build/lib/server/AfUnixServer.java
+++ b/src/main/java/com/google/devtools/build/lib/server/AfUnixServer.java
@@ -329,7 +329,14 @@ public final class AfUnixServer extends RPCServer {
     // (All this extra complexity is just used in tests... *sigh*).
     if (socketFile.toString().length() >= 104) { // = UNIX_PATH_MAX
       Path socketLink = socketFile;
-      String tmpDir = System.getProperty("blaze.rpcserver.tmpdir", "/tmp");
+      String tmpDirDefault = System.getenv("TMPDIR");
+      if (tmpDirDefault == null
+          || tmpDirDefault.length() > 104 - "/blaze-4294967296/server.socket".length()) {
+        // Default for unset TMPDIR, or if TMPDIR is so that the resulting
+        // path would be too long.
+        tmpDirDefault = "/tmp";
+      }
+      String tmpDir = System.getProperty("blaze.rpcserver.tmpdir", tmpDirDefault);
       socketFile = createTempSocketDirectory(socketFile.getRelative(tmpDir)).
           getRelative("server.socket");
       LOG.info("Using symlinked socket at " + socketFile);