added project column

Author: martin-kuba

cloud/pom.xml

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

metaacct/pom.xml

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

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

@@ -14,6 +14,7 @@ public class PBSMessage implements Serializable {
   private String group;
   private String jobname;
   private String queue;
+  private String project;
   private long createTime;  
   private long startTime;
   private long endTime;
@@ -118,7 +119,15 @@ public void setUser(String user) {
     this.user = user;
   }
 
-  public long getReqNcpus() {
+    public String getProject() {
+        return project;
+    }
+
+    public void setProject(String project) {
+        this.project = project;
+    }
+
+    public long getReqNcpus() {
     return reqNcpus;
   }
 
@@ -253,6 +262,7 @@ public String toString() {
                 ", group='" + group + '\'' +
                 ", jobname='" + jobname + '\'' +
                 ", queue='" + queue + '\'' +
+                ", project='" + project + '\'' +
                 ", createTime=" + createTime +
                 ", startTime=" + startTime +
                 ", endTime=" + endTime +

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

@@ -82,7 +82,7 @@ public List<String> saveRecords(final List<PBSRecord> records, final String host
         DataSource dataSource = getDataSource();
         SimpleJdbcInsert insertEndPbsRecord = new SimpleJdbcInsert(dataSource)
                 .withTableName("acct_pbs_record")
-                .usingColumns("acct_id_string", "date_time", "jobname", "queue",
+                .usingColumns("acct_id_string", "date_time", "jobname", "queue", "project",
                         "create_time", "start_time", "end_time", "exit_status", "acct_user_id", "ci_acct_pbs_server_id",
                         "req_ncpus", "req_nodes", "req_nodect", "req_mem", "req_walltime", "soft_walltime",
                         "used_ncpus", "used_mem", "used_vmem", "used_walltime", "used_cputime", "used_cpupercent",
@@ -276,6 +276,7 @@ private static Map<String, Object> prepareJobParams(Map<String, Long> allUsers,
         params.put("date_time", r.getDateTime());
         params.put("jobname", r.getMessageText().getJobname());
         params.put("queue", r.getMessageText().getQueue());
+        params.put("project", r.getMessageText().getProject());
         params.put("create_time", r.getMessageText().getCreateTime());
         params.put("start_time", r.getMessageText().getStartTime());
         params.put("acct_user_id", allUsers.get(r.getMessageText().getUser()));

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

@@ -89,6 +89,8 @@ public static List<PBSRecord> readPBSFile(InputStream is, Date limitForStartedJo
                     pbsMessage.setJobname(s.substring(s.indexOf('=') + 1));
                 } else if (s.startsWith("queue=")) {
                     pbsMessage.setQueue(s.substring(s.indexOf('=') + 1));
+                } else if (s.startsWith("project=")) {
+                    pbsMessage.setProject(s.substring(s.indexOf('=') + 1));
                 } else if (s.startsWith("ctime=")) {
                     pbsMessage.setCreateTime(Long.parseLong(s.substring(s.indexOf('=') + 1)));
                 } else if (s.startsWith("start=")) {

metaacct_cmd/pom.xml

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

pbsmon/pom.xml

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

perun_machines/pom.xml

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

pom.xml

@@ -7,9 +7,9 @@
     <packaging>pom</packaging>
 
     <!--
-    Use "mvn versions:set -DnewVersion=3.37; mvn versions:commit" to change version in all modules
+    Use "mvn versions:set -DnewVersion=3.38; mvn versions:commit" to change version in all modules
      -->
-    <version>3.36</version>
+    <version>3.37</version>
     <name>MetaCentrum Accounting Parent Project</name>
 
     <properties>