Merge pull request #31500 from vespa-engine/hmusum/remove-transaction-log-server-service-2

Update code after transactionlogserver service was removed

4 files changed, 20 insertions, 21 deletions

diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java
index d817071e072..fb27327b4c5 100644
--- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java
+++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java
@@ -16,6 +16,7 @@ public class ServiceType {
     public static final ServiceType HOST_ADMIN = new ServiceType("hostadmin");
     public static final ServiceType CONFIG_SERVER = new ServiceType("configserver");
     public static final ServiceType CONTROLLER = new ServiceType("controller");
+    // TODO: Remove TRANSACTION_LOG_SERVER when oldest Vespa version in use is 8.354
     public static final ServiceType TRANSACTION_LOG_SERVER = new ServiceType("transactionlogserver");
     public static final ServiceType CLUSTER_CONTROLLER = new ServiceType("container-clustercontroller");
     public static final ServiceType DISTRIBUTOR = new ServiceType("distributor");
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
index e9e96d8b0cf..920b2f7a868 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
@@ -131,7 +131,7 @@ public class IndexedTest extends ContentBaseTest {
         // String [] expectedServices = {"logserver", "configserver", "adminserver", "slobrok",
         //                               "logd", "configproxy","config-sentinel",
         //                               "container", "fleetcontroller",
-        //                               "storagenode", "searchnode", "distributor", "transactionlogserver"};
+        //                               "storagenode", "searchnode", "distributor"};
         // DomContentBuilderTest.assertServices(h, expectedServices);
         Routing routing = model.getRouting();
         assertNotNull(routing);
@@ -159,8 +159,7 @@ public class IndexedTest extends ContentBaseTest {
         // HostResource h = model.getHostSystem().getHosts().get(0);
         // String [] expectedServices = {"logserver", "configserver", "adminserver", "slobrok",
         //                               "logd", "configproxy","config-sentinel",
-        //                               "container", "storagenode", "searchnode", "distributor",
-        //                               "transactionlogserver"};
+        //                               "container", "storagenode", "searchnode", "distributor"};
         // DomContentBuilderTest.assertServices(h, expectedServices);
         ContentCluster s = model.getContentClusters().get("test");
 
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicy.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicy.java
index 83ff33b06a0..bdd16bc1c11 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicy.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicy.java
@@ -84,33 +84,32 @@ public class HostedVespaClusterPolicy implements ClusterPolicy {
 
     // Non-private for testing purposes
     SuspensionLimit getConcurrentSuspensionLimit(ClusterApi clusterApi) {
-        // Possible service clusters on a node as of 2021-01-22:
+        // Possible service clusters on a node as of 2024-06-09:
         //
         //       CLUSTER ID           SERVICE TYPE                  HEALTH       ASSOCIATION
         //    1  CCN-controllers      container-clustercontrollers  Slobrok      1, 3, or 6 in content cluster
         //    2  CCN                  distributor                   Slobrok      content cluster
         //    3  CCN                  storagenode                   Slobrok      content cluster
         //    4  CCN                  searchnode                    Slobrok      content cluster
-        //    5  CCN                  transactionlogserver          not checked  content cluster
-        //    6  JCCN                 container                     Slobrok      jdisc container cluster
-        //    7  admin                slobrok                       not checked  1-3 in jdisc container cluster
-        //    8  metrics              metricsproxy-container        Slobrok      application
-        //    9  admin                logd                          not checked  application
-        //   10  admin                config-sentinel               not checked  application
-        //   11  admin                configproxy                   not checked  application
-        //   12  admin                logforwarder                  not checked  application
-        //   13  controller           controller                    state/v1     controllers
-        //   14  zone-config-servers  configserver                  state/v1     config servers
-        //   15  controller-host      hostadmin                     state/v1     controller hosts
-        //   16  configserver-host    hostadmin                     state/v1     config server hosts
-        //   17  tenant-host          hostadmin                     state/v1     tenant hosts
-        //   18  proxy-host           hostadmin                     state/v1     proxy hosts
+        //    5  JCCN                 container                     Slobrok      jdisc container cluster
+        //    6  admin                slobrok                       not checked  1-3 in jdisc container cluster
+        //    7  metrics              metricsproxy-container        Slobrok      application
+        //    8  admin                logd                          not checked  application
+        //    9  admin                config-sentinel               not checked  application
+        //   10  admin                configproxy                   not checked  application
+        //   11  admin                logforwarder                  not checked  application
+        //   12  controller           controller                    state/v1     controllers
+        //   13  zone-config-servers  configserver                  state/v1     config servers
+        //   14  controller-host      hostadmin                     state/v1     controller hosts
+        //   15  configserver-host    hostadmin                     state/v1     config server hosts
+        //   16  tenant-host          hostadmin                     state/v1     tenant hosts
+        //   17  proxy-host           hostadmin                     state/v1     proxy hosts
         //
         // CCN refers to the content cluster's name, as specified in services.xml.
         // JCCN refers to the jdisc container cluster's name, as specified in services.xml.
         //
-        // For instance a content node will have 2-5 and 8-12 and possibly 1, while a combined
-        // cluster node may have all 1-12.
+        // For instance a content node will have 2-4 and 7-11 and possibly 1, while a combined
+        // cluster node may have all 1-11.
         //
         // The services on a node can be categorized into these main types, ref association column above:
         //   A  content
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java b/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java
index 102dec0d511..5f97900b557 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/slobrok/SlobrokMonitorManagerImpl.java
@@ -152,7 +152,7 @@ public class SlobrokMonitorManagerImpl extends AbstractComponent implements Slob
             case "logserver":
             case "metricsproxy":
             case "slobrok":
-            case "transactionlogserver":
+            case "transactionlogserver": // TODO: Remove when oldest Vespa version in use is 8.354
                 return Optional.empty();
 
             case "qrserver":