Added support for specifying user as which the task should run, and d…

…isabled named vip support temporarily (#278)
d2iq-archive · Oct 17, 2016 · 7a9553c · 7a9553c
1 parent 6ad9460
commit 7a9553c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/...ler/src/main/java/com/mesosphere/dcos/kafka/offer/PersistentOfferRequirementProvider.java b/...ler/src/main/java/com/mesosphere/dcos/kafka/offer/PersistentOfferRequirementProvider.java
@@ -340,18 +340,22 @@ private TaskInfo getNewTaskInfo(KafkaSchedulerConfiguration config, String confi
                     containerPath));
         }
 
-        if (clusterState.getCapabilities().supportsNamedVips()) {
-            DiscoveryInfo discoveryInfo = DiscoveryInfo.newBuilder()
-                    .setVisibility(DiscoveryInfo.Visibility.EXTERNAL)
-                    .setName(brokerName)
-                    .setPorts(Ports.newBuilder()
-                            .addPorts(Port.newBuilder()
-                                    .setNumber((int) (long)port)
-                                    .setProtocol("tcp")
-                                    .setLabels(labels("VIP_" + UUID.randomUUID(), "broker:9092")))
-                            .build())
-                    .build();
-            taskBuilder.setDiscovery(discoveryInfo);
+        try {
+            if (clusterState.getCapabilities().supportsNamedVips()) {
+                DiscoveryInfo discoveryInfo = DiscoveryInfo.newBuilder()
+                        .setVisibility(DiscoveryInfo.Visibility.EXTERNAL)
+                        .setName(brokerName)
+                        .setPorts(Ports.newBuilder()
+                                .addPorts(Port.newBuilder()
+                                        .setNumber((int) (long) port)
+                                        .setProtocol("tcp")
+                                        .setLabels(labels("VIP_" + UUID.randomUUID(), "broker:9092")))
+                                .build())
+                        .build();
+                taskBuilder.setDiscovery(discoveryInfo);
+            }
+        } catch (Exception e) {
+            log.error("Error querying for named vip support. Named VIP support will be unavailable.", e);
         }
 
         KafkaHealthCheckConfiguration healthCheckConfiguration = config.getHealthCheckConfiguration();

diff --git a/kafka-scheduler/src/main/java/com/mesosphere/dcos/kafka/web/ConnectionController.java b/kafka-scheduler/src/main/java/com/mesosphere/dcos/kafka/web/ConnectionController.java
@@ -49,8 +49,12 @@ public Response getConnectionInfo() {
             connectionInfo.put(ZOOKEEPER_KEY, zookeeperEndpoint);
             connectionInfo.put(ADDRESS_KEY, getBrokerList());
             connectionInfo.put(DNS_KEY, getBrokerDNSList());
-            if (clusterState.getCapabilities().supportsNamedVips()) {
-                connectionInfo.put(VIP_KEY, String.format("broker.%s.l4lb.thisdcos.directory:9092", frameworkName));
+            try {
+                if (clusterState.getCapabilities().supportsNamedVips()) {
+                    connectionInfo.put(VIP_KEY, String.format("broker.%s.l4lb.thisdcos.directory:9092", frameworkName));
+                }
+            } catch (Exception e) {
+                log.info("Unable to query for named VIP support.", e);
             }
             return Response.ok(connectionInfo.toString(), MediaType.APPLICATION_JSON).build();
         } catch (Exception ex) {

diff --git a/universe/config.json b/universe/config.json
@@ -10,6 +10,11 @@
             "type":"string",
             "default":"kafka"
           },
+          "user": {
+            "type": "string",
+            "description": "The user that the service will run as.",
+            "default": "root"
+          },
           "principal": {
             "description": "The principal for the Kafka service instance.",
             "type": "string",