[ARVADOS] updated: 8b75947ee3f99b87eec443763653ca6ae3eb21e1

[Git user]

Summary of changes:
 services/api/db/structure.sql               | 130 ++++++++++++++--------------
 services/nodemanager/arvnodeman/jobqueue.py |   2 +-
 2 files changed, 66 insertions(+), 66 deletions(-)

       via  8b75947ee3f99b87eec443763653ca6ae3eb21e1 (commit)
       via  4bd54c4c42f13434b84410b7917a8cd208d613d7 (commit)
      from  d069de03a99dc58fd38f241435fcbaac84e9f63a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 8b75947ee3f99b87eec443763653ca6ae3eb21e1
Merge: d069de0 4bd54c4
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Feb 20 16:18:44 2017 -0500

    Merge branch '6520-pending-reason' refs #6520


commit 4bd54c4c42f13434b84410b7917a8cd208d613d7
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Feb 20 13:54:47 2017 -0500

    6520: Add ReqNodeNotAvail to list of reasons (along with "Resources") to boot a new node.

diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql
index 4e3cd36..9e1f0c9 100644
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@ -29,6 +29,71 @@ SET default_tablespace = '';
 SET default_with_oids = false;
 
 --
+-- Name: groups; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE groups (
+    id integer NOT NULL,
+    uuid character varying(255),
+    owner_uuid character varying(255),
+    created_at timestamp without time zone NOT NULL,
+    modified_by_client_uuid character varying(255),
+    modified_by_user_uuid character varying(255),
+    modified_at timestamp without time zone,
+    name character varying(255) NOT NULL,
+    description character varying(524288),
+    updated_at timestamp without time zone NOT NULL,
+    group_class character varying(255)
+);
+
+
+--
+-- Name: links; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE links (
+    id integer NOT NULL,
+    uuid character varying(255),
+    owner_uuid character varying(255),
+    created_at timestamp without time zone NOT NULL,
+    modified_by_client_uuid character varying(255),
+    modified_by_user_uuid character varying(255),
+    modified_at timestamp without time zone,
+    tail_uuid character varying(255),
+    link_class character varying(255),
+    name character varying(255),
+    head_uuid character varying(255),
+    properties text,
+    updated_at timestamp without time zone NOT NULL
+);
+
+
+--
+-- Name: users; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE users (
+    id integer NOT NULL,
+    uuid character varying(255),
+    owner_uuid character varying(255) NOT NULL,
+    created_at timestamp without time zone NOT NULL,
+    modified_by_client_uuid character varying(255),
+    modified_by_user_uuid character varying(255),
+    modified_at timestamp without time zone,
+    email character varying(255),
+    first_name character varying(255),
+    last_name character varying(255),
+    identity_url character varying(255),
+    is_admin boolean,
+    prefs text,
+    updated_at timestamp without time zone NOT NULL,
+    default_owner_uuid character varying(255),
+    is_active boolean DEFAULT false,
+    username character varying(255)
+);
+
+
+--
 -- Name: api_client_authorizations; Type: TABLE; Schema: public; Owner: -; Tablespace: 
 --
 
@@ -374,25 +439,6 @@ ALTER SEQUENCE containers_id_seq OWNED BY containers.id;
 
 
 --
--- Name: groups; Type: TABLE; Schema: public; Owner: -; Tablespace: 
---
-
-CREATE TABLE groups (
-    id integer NOT NULL,
-    uuid character varying(255),
-    owner_uuid character varying(255),
-    created_at timestamp without time zone NOT NULL,
-    modified_by_client_uuid character varying(255),
-    modified_by_user_uuid character varying(255),
-    modified_at timestamp without time zone,
-    name character varying(255) NOT NULL,
-    description character varying(524288),
-    updated_at timestamp without time zone NOT NULL,
-    group_class character varying(255)
-);
-
-
---
 -- Name: groups_id_seq; Type: SEQUENCE; Schema: public; Owner: -
 --
 
@@ -659,27 +705,6 @@ ALTER SEQUENCE keep_services_id_seq OWNED BY keep_services.id;
 
 
 --
--- Name: links; Type: TABLE; Schema: public; Owner: -; Tablespace: 
---
-
-CREATE TABLE links (
-    id integer NOT NULL,
-    uuid character varying(255),
-    owner_uuid character varying(255),
-    created_at timestamp without time zone NOT NULL,
-    modified_by_client_uuid character varying(255),
-    modified_by_user_uuid character varying(255),
-    modified_at timestamp without time zone,
-    tail_uuid character varying(255),
-    link_class character varying(255),
-    name character varying(255),
-    head_uuid character varying(255),
-    properties text,
-    updated_at timestamp without time zone NOT NULL
-);
-
-
---
 -- Name: links_id_seq; Type: SEQUENCE; Schema: public; Owner: -
 --
 
@@ -985,31 +1010,6 @@ ALTER SEQUENCE traits_id_seq OWNED BY traits.id;
 
 
 --
--- Name: users; Type: TABLE; Schema: public; Owner: -; Tablespace: 
---
-
-CREATE TABLE users (
-    id integer NOT NULL,
-    uuid character varying(255),
-    owner_uuid character varying(255) NOT NULL,
-    created_at timestamp without time zone NOT NULL,
-    modified_by_client_uuid character varying(255),
-    modified_by_user_uuid character varying(255),
-    modified_at timestamp without time zone,
-    email character varying(255),
-    first_name character varying(255),
-    last_name character varying(255),
-    identity_url character varying(255),
-    is_admin boolean,
-    prefs text,
-    updated_at timestamp without time zone NOT NULL,
-    default_owner_uuid character varying(255),
-    is_active boolean DEFAULT false,
-    username character varying(255)
-);
-
-
---
 -- Name: users_id_seq; Type: SEQUENCE; Schema: public; Owner: -
 --
 
diff --git a/services/nodemanager/arvnodeman/jobqueue.py b/services/nodemanager/arvnodeman/jobqueue.py
index 5ea2c5c..abe8852 100644
--- a/services/nodemanager/arvnodeman/jobqueue.py
+++ b/services/nodemanager/arvnodeman/jobqueue.py
@@ -115,7 +115,7 @@ class JobQueueMonitorActor(clientactor.RemotePollLoopActor):
         queuelist = []
         for out in squeue_out.splitlines():
             cpu, ram, disk, reason, jobname = out.split(" ", 4)
-            if reason == "Resources":
+            if reason in ("Resources", "ReqNodeNotAvail"):
                 queuelist.append({
                     "uuid": jobname,
                     "runtime_constraints": {

-----------------------------------------------------------------------


hooks/post-receive
--