(maint) change maint-mode state of status implementation to :starting

documentation/api/status/v1/status.markdown

@@ -36,12 +36,16 @@ following:
 * `detail_level`: info is currently the only level
 * `service_status_version`: version of the status API
 * `service_version`: version of PuppetDB
-* `state`: "running" if read and write databases are up, "error" if down
+* `state`: short description of PuppetDB's current state:
+    * "starting" if PuppetDB is in maintenance mode
+    * "running" if not in maintenance mode and read and write databases are up
+    * "error" if the read or write databases are down.
 * `status`:
     * `maintenance_mode?`: indicates whether PuppetDB is in maintenance mode.
     PuppetDB enters maintenance mode at startup and exits it after completing any
     pending migrations and initial data synchronization (when using HA).
     While in maintenance mode PuppetDB will not respond to queries.
     * `read_db_up?`: indicates whether the read database is responding to queries
     * `write_db_up?`: indicates whether the write database is responding to queries
-    * `queue_depth`: depth of the command queue
+    * `queue_depth`: depth of the command queue. If the queue is not yet
+      initialized, this field will be null.

project.clj

@@ -12,7 +12,7 @@
 (def tk-version "1.1.1")
 (def tk-jetty9-version "1.3.1")
 (def ks-version "1.1.0")
-(def tk-status-version "0.2.0")
+(def tk-status-version "0.2.1")
 
 (def pdb-jvm-opts
   (case (System/getProperty "java.specification.version")

src/puppetlabs/puppetdb/pdb_routing.clj

@@ -123,16 +123,20 @@
                            1
                            (fn [level]
                              (let [globals (shared-globals)
-                                   queue-depth (->> [:command-processing :mq :endpoint]
-                                                    (get-in config)
-                                                    (mq/queue-size "localhost"))
+                                   queue-depth (try (->> [:command-processing :mq :endpoint]
+                                                         (get-in config)
+                                                         (mq/queue-size "localhost"))
+                                                    (catch Exception _
+                                                      nil))
                                    read-db-up? (sutils/db-up? (:scf-read-db globals))
                                    write-db-up? (sutils/db-up? (:scf-write-db globals))
-                                   state (if (and read-db-up? write-db-up?)
-                                           :running
-                                           :error)]
+                                   maintenance-mode? (maint-mode?)
+                                   state (cond
+                                           maintenance-mode? :starting
+                                           (and read-db-up? write-db-up?) :running
+                                           :else :error)]
                                {:state state
-                                :status {:maintenance_mode? (maint-mode?)
+                                :status {:maintenance_mode? maintenance-mode?
                                          :queue_depth queue-depth
                                          :read_db_up? read-db-up?
                                          :write_db_up? write-db-up?}}))))

src/puppetlabs/puppetdb/scf/storage_utils.clj

@@ -242,9 +242,10 @@
 (defn db-up?
   [db-spec]
   (utils/with-timeout 1000 false
-    (jdbc/with-transacted-connection db-spec
-      (try (let [select-42 "SELECT (a - b) AS answer FROM (VALUES ((7 * 7), 7)) AS x(a, b)"
-                 [{:keys [answer]}] (jdbc/query [select-42])]
-             (= answer 42))
-           (catch Exception _
-             false)))))
+    (try
+      (jdbc/with-transacted-connection db-spec
+        (let [select-42 "SELECT (a - b) AS answer FROM (VALUES ((7 * 7), 7)) AS x(a, b)"
+              [{:keys [answer]}] (jdbc/query [select-42])]
+          (= answer 42)))
+      (catch Exception _
+        false))))

test/puppetlabs/puppetdb/status_test.clj

@@ -25,13 +25,13 @@
   (testing "status returns as expected when in maintenance mode"
     (with-redefs [puppetlabs.puppetdb.pdb-routing/maint-mode? (constantly true)]
       (svc-utils/with-puppetdb-instance
-        (let [{:keys [body] :as pdb-resp} (-> svc-utils/*base-url*
-                                              (assoc :prefix "/status/v1/services")
-                                              base-url->str-with-prefix
-                                              client/get)
+        (let [{:keys [body status]} (-> svc-utils/*base-url*
+                                        (assoc :prefix "/status/v1/services")
+                                        base-url->str-with-prefix
+                                        (client/get {:throw-exceptions false}))
               pdb-status (:puppetdb-status (json/parse-string body true))]
-          (tu/assert-success! pdb-resp)
-          (is (= "running" (:state pdb-status)))
+          (is (= 503 status))
+          (is (= "starting" (:state pdb-status)))
           (is (= {:maintenance_mode? true
                   :read_db_up? true
                   :write_db_up? true