added pbs-m1

CESNET · Jan 26, 2024 · 3f2efa4 · 3f2efa4
1 parent 6d174e7
commit 3f2efa4
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 1 deletion.
diff --git a/pbsmon/src/main/java/cz/cesnet/meta/pbs/PbsConnectorFile.java b/pbsmon/src/main/java/cz/cesnet/meta/pbs/PbsConnectorFile.java
@@ -33,7 +33,7 @@ public PBS loadData(PbsServerConfig serverConfig) {
             File tempStderrFile = File.createTempFile("stderr", ".txt");
             File tmpDirectory = Paths.get(System.getProperty("java.io.tmpdir", "/tmp")).toFile();
 
-            Process p = new ProcessBuilder("pbsprocaller", serverHost)
+            Process p = new ProcessBuilder(serverConfig.getPbsCaller(), serverHost)
                     .inheritIO()
                     .redirectOutput(tempStdoutFile)
                     .redirectError(tempStderrFile)

diff --git a/pbsmon/src/main/java/cz/cesnet/meta/pbs/PbsServerConfig.java b/pbsmon/src/main/java/cz/cesnet/meta/pbs/PbsServerConfig.java
@@ -17,6 +17,7 @@ public class PbsServerConfig {
     private boolean by_queue;
     private List<FairshareConfig> fairshares;
     private String groupFile;
+    private String pbsCaller = "pbsprocaller";
     /**
      * If true, server uses plan-based scheduler, thus waiting jobs are sorted by planned_start instead of by queue priority and fairshare.
      */
@@ -92,6 +93,14 @@ public void setShortName(String shortName) {
         this.shortName = shortName;
     }
 
+    public String getPbsCaller() {
+        return pbsCaller;
+    }
+
+    public void setPbsCaller(String pbsCaller) {
+        this.pbsCaller = pbsCaller;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

diff --git a/pbsmon/src/main/resources/StripesResources_cs.properties b/pbsmon/src/main/resources/StripesResources_cs.properties
@@ -313,6 +313,7 @@ queues.titul=Fronty
 queues_total=celkem
 queue.titul=Fronta {0}
 server_meta-pbs.metacentrum.cz=Pl\u00E1nova\u010D infrastruktury MetaCentrum
+server_pbs-m1.metacentrum.cz=OpenPBS pl\u00E1nova\u010D MetaCentra
 server_arien-pro.ics.muni.cz=Star\u00FD pl\u00E1nova\u010D infrastruktury MetaCentrum
 server_cerit-pbs.cerit-sc.cz=Pl\u00E1nova\u010D infrastruktury CERIT-SC
 server_wagap-pro.cerit-sc.cz=Star\u00FD pl\u00E1nova\u010D infrastruktury CERIT-SC

diff --git a/pbsmon/src/main/resources/StripesResources_en.properties b/pbsmon/src/main/resources/StripesResources_en.properties
@@ -337,6 +337,7 @@ props.titul=Machine properties
 queues.titul=Queues
 queue.titul=Queue {0}
 server_meta-pbs.metacentrum.cz=Planner for infrastructure MetaCentrum
+server_pbs-m1.metacentrum.cz=OpenPBS planner for MetaCentrum
 server_arien-pro.ics.muni.cz=Old planner for infrastructure MetaCentrum
 server_cerit-pbs.cerit-sc.cz=Planner for infrastructure CERIT-SC
 server_wagap-pro.cerit-sc.cz=Old planner for infrastructure CERIT-SC

diff --git a/pbsmon/src/main/webapp/WEB-INF/spring-context.xml b/pbsmon/src/main/webapp/WEB-INF/spring-context.xml
@@ -51,6 +51,26 @@ http://www.springframework.org/schema/tx/spring-tx.xsd"
                     <property name="groupFile" value="/etc/pbsmon/group/meta-pbs"/>
                 </bean>
 
+                <bean class="cz.cesnet.meta.pbs.PbsServerConfig">
+                    <property name="shortName" value="pbs-m1"/>
+                    <property name="host" value="pbs-m1.metacentrum.cz"/>
+                    <property name="main" value="false"/>
+                    <property name="torque" value="false"/>
+                    <property name="by_queue" value="false"/>
+                    <property name="planbased" value="true"/>
+                    <property name="pbsCaller" value="/home/pbsmon/openpbs/openpbscaller.sh"/>
+                    <property name="fairshares">
+                        <list>
+                            <bean class="cz.cesnet.meta.pbs.FairshareConfig">
+                                <constructor-arg name="tree" value="default" />
+                                <constructor-arg name="metrics" value="fairshare" />
+                                <constructor-arg name="id" value="m1" />
+                            </bean>
+                        </list>
+                    </property>
+                    <property name="groupFile" value="/etc/pbsmon/group/pbs-m1"/>
+                </bean>
+
                 <bean class="cz.cesnet.meta.pbs.PbsServerConfig">
                     <property name="shortName" value="cerit"/>
                     <property name="host" value="cerit-pbs.cerit-sc.cz"/>