Changeset 5995

Timestamp:

Aug 21, 2020, 11:49:41 AM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #1259: Add support for Slurm

Added support for filtering when retrieving configured clusters.

Location:

extensions/net.sf.basedb.opengrid/trunk/src/net/sf/basedb/opengrid

Files:

• OpenGridCluster.java (modified) (5 diffs)
• filter (added)
• filter/ClusterTypeFilter.java (added)
• filter/IsConnectedFilter.java (added)
• filter/UsernameFilter.java (added)
• service/OpenGridService.java (modified) (5 diffs)

extensions/net.sf.basedb.opengrid/trunk/src/net/sf/basedb/opengrid/OpenGridCluster.java

@@ -175 +175 @@
     private final int timeAdjustment;
     private final boolean error;
+    private final boolean connected;
     
     Info(OpenGridSession session)
@@ -183 +184 @@
       timeAdjustment = session.getTimeAdjustment();
       error = hostInfo.getExitStatus() != 0 || ogsInfo.getExitStatus() != 0;
+      connected = true;
     }
     
@@ -200 +202 @@
       timeAdjustment = 0;
       error = true;
+      connected = false;
     }
     
@@ -208 +211 @@
     {
       return created;
+    }
+    
+    /**
+      TRUE if was possible to connect to the cluster, FALSE otherwise.
+      @since 1.4
+    */
+    public boolean isConnected()
+    {
+      return connected;
     }
     
@@ -243 +255 @@
       json.put("hostInfo", hostInfo.asJSONObject(options));
       json.put("openGridInfo", ogsInfo.asJSONObject(options));
+      json.put("connected", connected);
       json.put("error", error);
       return json;

extensions/net.sf.basedb.opengrid/trunk/src/net/sf/basedb/opengrid/service/OpenGridService.java

@@ -45 +45 @@
 import net.sf.basedb.util.extensions.Registry;
 import net.sf.basedb.util.extensions.manager.Settings;
+import net.sf.basedb.util.filter.Filter;
+import net.sf.basedb.util.filter.StaticFilter;
 
 /**
@@ -158 +160 @@
   
   /**
+    @see #getClusters(DbControl, Collection, Filter)
+  */
+  public Collection<OpenGridCluster> getClusters(DbControl dc, Collection<Include> include)
+  {
+    return getClusters(dc, include, null);
+  }
+  
+  /**
     Get all clusters that the logged in user is allowed to use.
     This method uses a query for job agents with the given include
@@ -166 +176 @@
     @param include A set of include options for the job agent query
       (if null the default query options are used)
-  */
-  public Collection<OpenGridCluster> getClusters(DbControl dc, Collection<Include> include)
+    @param filter Optional filter, if not specified all clusters are returned
+    @since 1.4
+  */
+  public Collection<OpenGridCluster> getClusters(DbControl dc, Collection<Include> include, Filter<OpenGridCluster> filter)
   {
     ItemQuery<JobAgent> query = JobAgent.getQuery();
     if (include != null) query.setIncludes(include);
-    return getClusters(query.list(dc));
+    return getClusters(query.list(dc), filter);
+  }
+  
+  /**
+    @see #getClusters(Collection, Filter)
+  */
+  public Collection<OpenGridCluster> getClusters(Collection<JobAgent> jobAgents)
+  {
+    return getClusters(jobAgents, null);
   }
   
@@ -182 +202 @@
       If null or empty, only clusters that are open to all are 
       returned
-  */
-  public Collection<OpenGridCluster> getClusters(Collection<JobAgent> jobAgents)
+    @param filter Optional filter, if not specified all clusters are returned
+    @since 1.4
+  */
+  public Collection<OpenGridCluster> getClusters(Collection<JobAgent> jobAgents, Filter<OpenGridCluster> filter)
   {
     // Collect the external id of the given job agents
@@ -199 +221 @@
     
     List<OpenGridCluster> result = new ArrayList<>();
+    if (filter == null) filter = new StaticFilter<OpenGridCluster>(true);
     for (OpenGridCluster cluster : clusters.values())
     {
-      String jobAgentId = cluster.getConfig().getJobAgentExternalId();
-      if (jobAgentId == null || usableJobAgents.contains(jobAgentId))
-      {
-        result.add(cluster);
+      if (filter.evaluate(cluster)) 
+      {
+        String jobAgentId = cluster.getConfig().getJobAgentExternalId();
+        if (jobAgentId == null || usableJobAgents.contains(jobAgentId))
+        {
+          result.add(cluster);
+        }
       }
     }