Merge branch 'master' into hakonhall/define-enable-logserver-flag

6 files changed, 12 insertions, 39 deletions

diff --git a/configserver/pom.xml b/configserver/pom.xml
index 210e584fd85..cf75eb3b999 100644
--- a/configserver/pom.xml
+++ b/configserver/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>com.yahoo.vespa</groupId>
     <artifactId>parent</artifactId>
-    <version>6-SNAPSHOT</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <artifactId>configserver</artifactId>
   <packaging>container-plugin</packaging>
-  <version>6-SNAPSHOT</version>
+  <version>7-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.hamcrest</groupId>
diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml
index cacbd45ed8e..c3f3e7b6fff 100644
--- a/configserver/src/main/resources/configserver-app/services.xml
+++ b/configserver/src/main/resources/configserver-app/services.xml
@@ -14,7 +14,7 @@
       <initiallyInRotation>false</initiallyInRotation>
     </config>
 
-    <accesslog type="vespa" fileNamePattern="logs/vespa/configserver/access.log.%Y%m%d%H%M%S" rotationScheme="date" compressOnRotation="true" symlinkName="access.log" />
+    <accesslog type="vespa" fileNamePattern="logs/vespa/configserver/access.log.%Y%m%d%H%M%S" compressOnRotation="true" symlinkName="access.log" />
     <preprocess:include file='access-logging.xml' required='false' />
 
     <component id="com.yahoo.vespa.config.server.ConfigServerBootstrap" bundle="configserver" />
@@ -57,9 +57,6 @@
     <preprocess:include file='hosted-vespa/routing-status.xml' required='false' />
     <preprocess:include file='model-integration.xml' required='true' />
 
-    <!-- TODO Vespa 7: Remove scoreboard.xml, replaced by metrics-packets.xml -->
-    <preprocess:include file='hosted-vespa/scoreboard.xml' required='false' />
-
     <component id="com.yahoo.vespa.configserver.flags.ConfigServerFlagSource" bundle="configserver-flags"/>
     <component id="com.yahoo.vespa.configserver.flags.db.FlagsDbImpl" bundle="configserver-flags"/>
 
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver
index 4248372013e..b3fab139cfe 100755
--- a/configserver/src/main/sh/start-configserver
+++ b/configserver/src/main/sh/start-configserver
@@ -171,6 +171,11 @@ vespa-run-as-vespa-user vespa-runserver -s configserver -r 30 -p $pidfile -- \
 	-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${VESPA_HOME}/var/crash \
 	-XX:+ExitOnOutOfMemoryError \
 	$jvmargs \
+    --illegal-access=warn \
+    --add-opens=java.base/java.io=ALL-UNNAMED \
+    --add-opens=java.base/java.lang=ALL-UNNAMED \
+    --add-opens=java.base/java.net=ALL-UNNAMED \
+    --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED \
 	-Djava.library.path=${VESPA_HOME}/lib64 \
 	-Djava.awt.headless=true \
 	-Dsun.rmi.dgc.client.gcInterval=3600000 \
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java
index 0595be3230f..1310c9d7bf5 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/SuperModelControllerTest.java
@@ -145,16 +145,18 @@ public class SuperModelControllerTest {
         Applications.Hosts hosts = app.hosts(host);
         assertThat(hosts.hostname(), is(host));
         for (Map.Entry<String, Applications.Hosts.Services> e : app.hosts(host).services().entrySet()) {
-            System.out.println(e);
+            System.out.println(e.getKey());
             if ("qrserver".equals(e.getKey())) {
                 Applications.Hosts.Services s = e.getValue();
+                System.out.println(s);
                 assertThat(s.type(), is("qrserver"));
                 assertThat(s.ports().size(), is(4));
+                assertThat(s.ports().get(0).number(), is(8000));
                 assertThat(s.index(), is(0));
                 return;
             }
         }
-        org.junit.Assert.fail("No qrserver service in config");
+        org.junit.Assert.fail("No container service in config");
     }
 
     private DeployState createDeployState(File applicationPackage, ApplicationId applicationId) {
@@ -170,6 +172,3 @@ public class SuperModelControllerTest {
     }
 
 }
-
-
-
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/spooler.def b/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/spooler.def
deleted file mode 100644
index 2721af7e278..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/configdefs/spooler.def
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-# Which directory to find spool files in.
-directory string default="/home/vespa/var/spool/vespa"
-
-# If true, move successfully processed files to <directory>/success
-keepsuccess bool default=false
-
-# Trace level on error messages from messagebus
-tracelevel int default=5
-
-# Which parsers to use and config for each of them.
-parsers[].classname string
-parsers[].parameters[].key string
-parsers[].parameters[].value string
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/spooler.clients-spooler-spooler.cfg b/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/spooler.clients-spooler-spooler.cfg
deleted file mode 100644
index 038d655e83c..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/modelconfigs/spooler.clients-spooler-spooler.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-directory /home/vespa/var/spool/vespa/
-keepsuccess false
-parsers[4]
-parsers[0].classname com.yahoo.vespaspooler.XMLFileParser
-parsers[0].parameters[0]
-parsers[1].classname com.yahoo.mail.vespa.spooler.MailFileParser
-parsers[1].parameters[0]
-parsers[2].classname com.yahoo.mail.vespa.spooler.UserDeleteParser
-parsers[2].parameters[0]
-parsers[3].classname com.yahoo.mail.vespa.spooler.VespaGrimParser
-parsers[3].parameters[1]
-parsers[3].parameters[0].key chunksize
-parsers[3].parameters[0].value 5