From 57ec5b1414bae9473e986da79d89070dbc954fc4 Mon Sep 17 00:00:00 2001
From: Nick Mahilani <nmahilani@netflix.com>
Date: Fri, 15 Jan 2021 15:51:59 -0800
Subject: [PATCH] more logging around mesos scheduler driver init

---
 .../mantisrx/server/master/mesos/MesosDriverSupplier.java   | 4 +++-
 .../master/mesos/VirtualMachineMasterServiceMesosImpl.java  | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/server/master/mesos/MesosDriverSupplier.java b/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/server/master/mesos/MesosDriverSupplier.java
index 7f1afa9f8..d30f697b3 100644
--- a/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/server/master/mesos/MesosDriverSupplier.java
+++ b/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/server/master/mesos/MesosDriverSupplier.java
@@ -59,6 +59,7 @@ public MesosDriverSupplier(final MasterConfiguration masterConfig,
     @Override
     public MesosSchedulerDriver get() {
         if (addVMLeaseAction == null) {
+            logger.warn("addVMLeaseAction is null, attempt to get Mesos Driver before MesosDriverSupplier init");
             throw new IllegalStateException("addVMLeaseAction must be set before creating MesosSchedulerDriver");
         }
 
@@ -77,7 +78,8 @@ public MesosSchedulerDriver get() {
             logger.info("initializing mesos scheduler driver");
             final MesosSchedulerDriver mesosDriver =
                     new MesosSchedulerDriver(mesosSchedulerCallbackHandler, framework, masterConfig.getMasterLocation());
-            mesosDriverRef.compareAndSet(null, mesosDriver);
+            boolean result = mesosDriverRef.compareAndSet(null, mesosDriver);
+            logger.info("initialized mesos scheduler driver {}", result);
         }
 
         return mesosDriverRef.get();
diff --git a/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/server/master/mesos/VirtualMachineMasterServiceMesosImpl.java b/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/server/master/mesos/VirtualMachineMasterServiceMesosImpl.java
index de55cf564..bb0e310b3 100644
--- a/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/server/master/mesos/VirtualMachineMasterServiceMesosImpl.java
+++ b/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/server/master/mesos/VirtualMachineMasterServiceMesosImpl.java
@@ -407,6 +407,9 @@ public void killTask(final WorkerId workerId) {
             }
         } catch (RuntimeException e) {
             // IllegalStateException from no mesosDriver's addVMLeaseAction or NPE from mesosDriver.get() being null.
+            if (mesosDriver.get() == null) {
+                logger.warn("mesosDriver supplier returned null mesosDriver");
+            }
             logger.error("Unexpected to see Mesos driver not initialized", e);
             System.exit(2);
         }
@@ -424,7 +427,8 @@ public void call() {
                 executor.execute(() -> {
                     try {
                         logger.info("invoking the Mesos driver run");
-                        mesosDriver.get().run();
+                        Protos.Status status = mesosDriver.get().run();
+                        logger.info("MesosSchedulerDriver run status {}", status);
                     } catch (Exception e) {
                         logger.error("Failed to register Mantis Framework with Mesos", e);
                         System.exit(2);