/opt/vespa -> /opt/yahoo/vespa (#648)

9 files changed, 29 insertions, 29 deletions

diff --git a/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java b/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java
index bbca3c3aa34..060fd3c56cd 100644
--- a/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java
+++ b/defaults/src/main/java/com/yahoo/vespa/defaults/Defaults.java
@@ -29,8 +29,8 @@ public class Defaults {
     private String findVespaHome() {
         Optional<String> vespaHomeEnv = Optional.ofNullable(System.getenv("VESPA_HOME"));
         if ( ! vespaHomeEnv.isPresent() || vespaHomeEnv.get().trim().isEmpty()) {
-            log.info("VESPA_HOME not set, using /opt/vespa/");
-            return "/opt/vespa/";
+            log.info("VESPA_HOME not set, using /opt/yahoo/vespa/");
+            return "/opt/yahoo/vespa/";
         }
         String vespaHome = vespaHomeEnv.get();
         if ( ! vespaHome.endsWith("/"))
diff --git a/defaults/src/test/java/com/yahoo/vespa/defaults/DefaultsTestCase.java b/defaults/src/test/java/com/yahoo/vespa/defaults/DefaultsTestCase.java
index 28cdc4e699d..ef64b6a252a 100644
--- a/defaults/src/test/java/com/yahoo/vespa/defaults/DefaultsTestCase.java
+++ b/defaults/src/test/java/com/yahoo/vespa/defaults/DefaultsTestCase.java
@@ -12,7 +12,7 @@ public class DefaultsTestCase {
 
     @Test
     public void testUnderVespaHome() {
-        assertEquals("/opt/vespa/my/relative/path", Defaults.getDefaults().underVespaHome("my/relative/path"));
+        assertEquals("/opt/yahoo/vespa/my/relative/path", Defaults.getDefaults().underVespaHome("my/relative/path"));
         assertEquals("/my/absolute/path", Defaults.getDefaults().underVespaHome("/my/absolute/path"));
         assertEquals("./my/explicit/relative/path", Defaults.getDefaults().underVespaHome("./my/explicit/relative/path"));
     }
diff --git a/defaults/src/vespa/defaults.cpp b/defaults/src/vespa/defaults.cpp
index 5c2547b730e..74fc36f1859 100644
--- a/defaults/src/vespa/defaults.cpp
+++ b/defaults/src/vespa/defaults.cpp
@@ -12,7 +12,7 @@
 
 namespace {
 
-const char *defaultHome = "/opt/vespa/";
+const char *defaultHome = "/opt/yahoo/vespa/";
 char computedHome[PATH_MAX];
 int defaultWebServicePort = 8080;
 int defaultPortBase = 19000;
diff --git a/dist/vespa.spec b/dist/vespa.spec
index a6e3745b2eb..9a2baa2119a 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -3,7 +3,7 @@
 %define __jar_repack %{nil}
 
 # Force special prefix for Vespa
-%define _prefix /opt/vespa
+%define _prefix /opt/yahoo/vespa
 
 Name:           vespa
 Version:        VESPA_VERSION
@@ -65,9 +65,9 @@ sh bootstrap.sh
 mvn install -DskipTests -Dmaven.javadoc.skip=true
 cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DJAVA_HOME=/usr/lib/jvm/java-openjdk \
-       -DEXTRA_LINK_DIRECTORY="/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm" \
-       -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-boost/include;/opt/vespa-libtorrent/include;/opt/vespa-zookeeper-c-client/include;/opt/vespa-cppunit/include" \
-       -DCMAKE_INSTALL_RPATH="%{_prefix}/lib64;/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server" \
+       -DEXTRA_LINK_DIRECTORY="/opt/yahoo/vespa-boost/lib;/opt/yahoo/vespa-libtorrent/lib;/opt/yahoo/vespa-zookeeper-c-client/lib;/opt/yahoo/vespa-cppunit/lib;/usr/lib64/llvm" \
+       -DEXTRA_INCLUDE_DIRECTORY="/opt/yahoo/vespa-boost/include;/opt/yahoo/vespa-libtorrent/include;/opt/yahoo/vespa-zookeeper-c-client/include;/opt/yahoo/vespa-cppunit/include" \
+       -DCMAKE_INSTALL_RPATH="%{_prefix}/lib64;/opt/yahoo/vespa-boost/lib;/opt/yahoo/vespa-libtorrent/lib;/opt/yahoo/vespa-zookeeper-c-client/lib;/opt/yahoo/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server" \
        -DCMAKE_BUILD_RPATH=%{_prefix}/lib64 \
        .
 
diff --git a/docker/run-vespa-internal.sh b/docker/run-vespa-internal.sh
index dbfc9cc9777..63029894936 100755
--- a/docker/run-vespa-internal.sh
+++ b/docker/run-vespa-internal.sh
@@ -15,15 +15,15 @@ VESPA_VERSION=$1
 rpm -i "vespa*-${VESPA_VERSION}-*.rpm"
 
 # Workaround until we figure out why rpm does not set the ownership.
-chown -R vespa:vespa /opt/vespa
+chown -R vespa:vespa /opt/yahoo/vespa
 
 export VESPA_CONFIG_SERVERS=$(hostname)
 
-/opt/vespa/bin/vespa-start-configserver
-/opt/vespa/bin/vespa-start-services
+/opt/yahoo/vespa/bin/vespa-start-configserver
+/opt/yahoo/vespa/bin/vespa-start-services
 
 # Print log forever
 while true; do
-  /opt/vespa/bin/logfmt -f /opt/vespa/logs/vespa/vespa.log
+  /opt/yahoo/vespa/bin/logfmt -f /opt/yahoo/vespa/logs/vespa/vespa.log
   sleep 10
 done
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java
index 5d38e66ffab..ccb39024307 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerFailTest.java
@@ -74,8 +74,8 @@ public class DockerFailTest {
 
         assert callOrder.verifyInOrder(1000,
                 "createContainerCommand with DockerImage: DockerImage { imageId=dockerImage }, HostName: hostName, ContainerName: ContainerName { name=container }",
-                "executeInContainer with ContainerName: ContainerName { name=container }, args: [/usr/bin/env, test, -x, /opt/vespa/bin/vespa-nodectl]",
-                "executeInContainer with ContainerName: ContainerName { name=container }, args: [/opt/vespa/bin/vespa-nodectl, resume]");
+                "executeInContainer with ContainerName: ContainerName { name=container }, args: [/usr/bin/env, test, -x, /opt/yahoo/vespa/bin/vespa-nodectl]",
+                "executeInContainer with ContainerName: ContainerName { name=container }, args: [/opt/yahoo/vespa/bin/vespa-nodectl, resume]");
     }
 
     @After
@@ -90,7 +90,7 @@ public class DockerFailTest {
         assertTrue(callOrder.verifyInOrder(1000,
                 "deleteContainer with ContainerName: ContainerName { name=container }",
                 "createContainerCommand with DockerImage: DockerImage { imageId=dockerImage }, HostName: hostName, ContainerName: ContainerName { name=container }",
-                "executeInContainer with ContainerName: ContainerName { name=container }, args: [/usr/bin/env, test, -x, /opt/vespa/bin/vespa-nodectl]",
-                "executeInContainer with ContainerName: ContainerName { name=container }, args: [/opt/vespa/bin/vespa-nodectl, resume]"));
+                "executeInContainer with ContainerName: ContainerName { name=container }, args: [/usr/bin/env, test, -x, /opt/yahoo/vespa/bin/vespa-nodectl]",
+                "executeInContainer with ContainerName: ContainerName { name=container }, args: [/opt/yahoo/vespa/bin/vespa-nodectl, resume]"));
     }
 }
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java
index de83c4631e5..f67e21bbcd3 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java
@@ -91,19 +91,19 @@ public class MultiDockerTest {
 
         assertTrue(callOrder.verifyInOrder(1000,
                 "createContainerCommand with DockerImage: DockerImage { imageId=image1 }, HostName: host1, ContainerName: ContainerName { name=container1 }",
-                "executeInContainer with ContainerName: ContainerName { name=container1 }, args: [/usr/bin/env, test, -x, /opt/vespa/bin/vespa-nodectl]",
-                "executeInContainer with ContainerName: ContainerName { name=container1 }, args: [/opt/vespa/bin/vespa-nodectl, resume]",
+                "executeInContainer with ContainerName: ContainerName { name=container1 }, args: [/usr/bin/env, test, -x, /opt/yahoo/vespa/bin/vespa-nodectl]",
+                "executeInContainer with ContainerName: ContainerName { name=container1 }, args: [/opt/yahoo/vespa/bin/vespa-nodectl, resume]",
 
                 "createContainerCommand with DockerImage: DockerImage { imageId=image2 }, HostName: host2, ContainerName: ContainerName { name=container2 }",
-                "executeInContainer with ContainerName: ContainerName { name=container2 }, args: [/usr/bin/env, test, -x, /opt/vespa/bin/vespa-nodectl]",
-                "executeInContainer with ContainerName: ContainerName { name=container2 }, args: [/opt/vespa/bin/vespa-nodectl, resume]",
+                "executeInContainer with ContainerName: ContainerName { name=container2 }, args: [/usr/bin/env, test, -x, /opt/yahoo/vespa/bin/vespa-nodectl]",
+                "executeInContainer with ContainerName: ContainerName { name=container2 }, args: [/opt/yahoo/vespa/bin/vespa-nodectl, resume]",
 
                 "stopContainer with ContainerName: ContainerName { name=container2 }",
                 "deleteContainer with ContainerName: ContainerName { name=container2 }",
 
                 "createContainerCommand with DockerImage: DockerImage { imageId=image1 }, HostName: host3, ContainerName: ContainerName { name=container3 }",
-                "executeInContainer with ContainerName: ContainerName { name=container3 }, args: [/usr/bin/env, test, -x, /opt/vespa/bin/vespa-nodectl]",
-                "executeInContainer with ContainerName: ContainerName { name=container3 }, args: [/opt/vespa/bin/vespa-nodectl, resume]"));
+                "executeInContainer with ContainerName: ContainerName { name=container3 }, args: [/usr/bin/env, test, -x, /opt/yahoo/vespa/bin/vespa-nodectl]",
+                "executeInContainer with ContainerName: ContainerName { name=container3 }, args: [/opt/yahoo/vespa/bin/vespa-nodectl, resume]"));
 
         assertTrue("Maintainer did not receive call to delete application storage", callOrder.verifyInOrder(1000,
                         "deleteContainer with ContainerName: ContainerName { name=container2 }",
@@ -136,8 +136,8 @@ public class MultiDockerTest {
 
         assert callOrder.verifyInOrder(1000,
                 "createContainerCommand with DockerImage: " + dockerImage.get() + ", HostName: " + hostName + ", ContainerName: " + containerName,
-                "executeInContainer with ContainerName: " + containerName + ", args: [/usr/bin/env, test, -x, /opt/vespa/bin/vespa-nodectl]",
-                "executeInContainer with ContainerName: " + containerName + ", args: [/opt/vespa/bin/vespa-nodectl, resume]");
+                "executeInContainer with ContainerName: " + containerName + ", args: [/usr/bin/env, test, -x, /opt/yahoo/vespa/bin/vespa-nodectl]",
+                "executeInContainer with ContainerName: " + containerName + ", args: [/opt/yahoo/vespa/bin/vespa-nodectl, resume]");
 
         return containerNodeSpec;
     }
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java
index b8785a2bae1..6391d9e3eec 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java
@@ -81,8 +81,8 @@ public class NodeStateTest {
 
         assert callOrder.verifyInOrder(5000,
                 "createContainerCommand with DockerImage: DockerImage { imageId=dockerImage }, HostName: host1, ContainerName: ContainerName { name=container }",
-                "executeInContainer with ContainerName: ContainerName { name=container }, args: [/usr/bin/env, test, -x, /opt/vespa/bin/vespa-nodectl]",
-                "executeInContainer with ContainerName: ContainerName { name=container }, args: [/opt/vespa/bin/vespa-nodectl, resume]");
+                "executeInContainer with ContainerName: ContainerName { name=container }, args: [/usr/bin/env, test, -x, /opt/yahoo/vespa/bin/vespa-nodectl]",
+                "executeInContainer with ContainerName: ContainerName { name=container }, args: [/opt/yahoo/vespa/bin/vespa-nodectl, resume]");
     }
 
     @After
@@ -156,7 +156,7 @@ public class NodeStateTest {
         assertTrue("Node not started again after being put to active state", callOrder.verifyInOrder(1000,
                 "deleteContainer with ContainerName: ContainerName { name=container }",
                 "createContainerCommand with DockerImage: DockerImage { imageId=newDockerImage }, HostName: host1, ContainerName: ContainerName { name=container }",
-                "executeInContainer with ContainerName: ContainerName { name=container }, args: [/usr/bin/env, test, -x, /opt/vespa/bin/vespa-nodectl]",
-                "executeInContainer with ContainerName: ContainerName { name=container }, args: [/opt/vespa/bin/vespa-nodectl, resume]"));
+                "executeInContainer with ContainerName: ContainerName { name=container }, args: [/usr/bin/env, test, -x, /opt/yahoo/vespa/bin/vespa-nodectl]",
+                "executeInContainer with ContainerName: ContainerName { name=container }, args: [/opt/yahoo/vespa/bin/vespa-nodectl, resume]"));
     }
 }
diff --git a/vespamalloc/src/vespamalloc/malloc/memorywatcher.h b/vespamalloc/src/vespamalloc/malloc/memorywatcher.h
index 2a3f6ea42f4..8b41e1cc5e3 100644
--- a/vespamalloc/src/vespamalloc/malloc/memorywatcher.h
+++ b/vespamalloc/src/vespamalloc/malloc/memorywatcher.h
@@ -226,7 +226,7 @@ namespace {
 
 const char *vespaHomeConf(char pathName[])
 {
-    const char *home = "/opt/vespa";
+    const char *home = "/opt/yahoo/vespa";
     const char *env = getenv("VESPA_HOME");
     if (env != NULL) {
         home = env;