added GPU params

Author: martin-kuba

.gitignore

@@ -8,4 +8,3 @@ test-output
 *~
 config.properties
 dependency-reduced-pom.xml
-deploy.sh

cloud/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.35</version>
+        <version>3.36</version>
     </parent>
 
     <artifactId>cloud</artifactId>

metaacct/deploy.sh

@@ -0,0 +1,3 @@
+echo "deploying"
+scp target/metaacct.war [email protected]:/var/lib/tomcat9/webapps/
+

metaacct/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.35</version>
+        <version>3.36</version>
     </parent>
 
     <artifactId>metaacct</artifactId>

metaacct/src/main/java/cz/cesnet/meta/accounting/server/data/PBSMessage.java

@@ -34,6 +34,10 @@ public class PBSMessage implements Serializable {
   private int usedCpupercent;
   private long softWalltime;
 
+  private int usedGpupercent;
+  private int usedGpuMemMaxPercent;
+  private float usedGpuPowerUsage;
+
   private List<PBSHost> execHosts;
   private List<NodeSpec> nodesSpecs;
 
@@ -218,7 +222,31 @@ public void setSoftWalltime(long softWalltime) {
     this.softWalltime = softWalltime;
   }
 
-  @Override
+    public int getUsedGpupercent() {
+        return usedGpupercent;
+    }
+
+    public void setUsedGpupercent(int usedGpupercent) {
+        this.usedGpupercent = usedGpupercent;
+    }
+
+    public int getUsedGpuMemMaxPercent() {
+        return usedGpuMemMaxPercent;
+    }
+
+    public void setUsedGpuMemMaxPercent(int usedGpuMemMaxPercent) {
+        this.usedGpuMemMaxPercent = usedGpuMemMaxPercent;
+    }
+
+    public float getUsedGpuPowerUsage() {
+        return usedGpuPowerUsage;
+    }
+
+    public void setUsedGpuPowerUsage(float usedGpuPowerUsage) {
+        this.usedGpuPowerUsage = usedGpuPowerUsage;
+    }
+
+    @Override
     public String toString() {
         return "PBSMessage{" +
                 "user='" + user + '\'' +

metaacct/src/main/java/cz/cesnet/meta/accounting/server/service/PbsRecordManagerImpl.java

@@ -294,6 +294,9 @@ private static Map<String, Object> prepareJobParams(Map<String, Long> allUsers,
             params.put("used_walltime", r.getMessageText().getUsedWalltime());
             params.put("used_cputime", r.getMessageText().getUsedCputime());
             params.put("used_cpupercent", r.getMessageText().getUsedCpupercent());
+            params.put("used_gpupercent", r.getMessageText().getUsedGpupercent());
+            params.put("used_gpumemmaxpercent", r.getMessageText().getUsedGpuMemMaxPercent());
+            params.put("used_gpupowerusage", r.getMessageText().getUsedGpuPowerUsage());
         }
         return params;
     }

metaacct/src/main/java/cz/cesnet/meta/accounting/server/util/PBSReader.java

@@ -113,8 +113,17 @@ public static List<PBSRecord> readPBSFile(InputStream is, Date limitForStartedJo
                     String vmem = s.substring(s.indexOf('=') + 1);
                     pbsMessage.setUsedVmem(StringUtils.parsePbsLogSizeFormat(vmem));
                 } else if (s.startsWith("resources_used.cpupercent=")) {
-                    String ncpus = s.substring(s.indexOf('=') + 1);
-                    pbsMessage.setUsedCpupercent(Integer.parseInt(ncpus));
+                    String cpupercent = s.substring(s.indexOf('=') + 1);
+                    pbsMessage.setUsedCpupercent(Integer.parseInt(cpupercent));
+                } else if (s.startsWith("resources_used.gpupercent=")) {
+                    String gpupercent = s.substring(s.indexOf('=') + 1);
+                    pbsMessage.setUsedGpupercent(Integer.parseInt(gpupercent));
+                } else if (s.startsWith("resources_used.gpumemmaxpercent=")) {
+                    String gpumemmaxpercent = s.substring(s.indexOf('=') + 1);
+                    pbsMessage.setUsedGpuMemMaxPercent(Integer.parseInt(gpumemmaxpercent));
+                } else if (s.startsWith("resources_used.gpupowerusage=")) {
+                    String gpupowerusage = s.substring(s.indexOf('=') + 1);
+                    pbsMessage.setUsedGpuPowerUsage(Float.parseFloat(gpupowerusage));
                 } else if (s.startsWith("Resource_List.walltime=")) {
                     String walltime = s.substring(s.indexOf('=') + 1);
                     pbsMessage.setReqWalltime(StringUtils.parsePbsLogTimeFormat(walltime));

metaacct_cmd/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.35</version>
+        <version>3.36</version>
     </parent>
 
     <artifactId>metaacct_cmd</artifactId>

pbsmon/deploy.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+#echo "compiling"
+#mvn clean package
+echo "deploying"
+scp target/pbsmon2.war [email protected]:/var/lib/tomcat9/webapps/

pbsmon/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.35</version>
+        <version>3.36</version>
     </parent>
 
     <artifactId>pbsmon</artifactId>