Merge branch '2.0.x' into 2.1.x

crss-admin/crss-admin-pemc-top-sit.yml

@@ -20,7 +20,7 @@ crss:
     host: "10.176.24.26"
     port: 636
     root-dn: "dc=wesmsys,dc=local"
-    user-search-base: ""
+    user-search-base: MO,MP,SO
     admin-user: "wesmsys\\crssadmin"
     admin-password: "123qweASD"
     username-field: "userPrincipalName"

crss-settlement-task-calculation/crss-settlement-task-calculation.yml

@@ -60,6 +60,8 @@ spring:
         ddl-auto: validate
         hbm2ddl:
           import_files:
+        jdbc:
+          batch_size: 10000
 
   cloud:
     task:
@@ -70,7 +72,7 @@ spring:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
           memory: 8192
-          cpu: 1
+          cpu: 2
         dcos:
           authorizationToken: eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJkY29zX2hpc3Rvcnlfc2VydmljZSIsImV4cCI6NDY1NTE3ODM0OX0.erK7saZPxkEOP6k1S8CNvITHQ1SyEUj1cW5qx4GTQU-MPOwxMsFAcFYO0zAthXPYQSzaRxykTelkLMJTsSQVro9bGJcHua7SedIqCmq1TvAUBSJugyxsDxu07mmS-Yh7MwpmG3LAOItwCYzWhihMqdLKRA19iimAs8xS6V5uKo5U5Fq1lOAQ0ye4f4L9CgF8WWyIqILdpynLRIx_eViY5RWtqYznV8otg0jkJGsjHQQmPZa732NY0crJtDcN713wVqT4SZoG993-Zv4mH_RU0a7NbwtvFE1mCfmja1aMp_gtogdS3xdQvRcS1BzaoJs4_dGUvRoQdUeseuTbHkF6VQ
 
@@ -85,16 +87,16 @@ spring:
     port: 6379
 
 batch:
-  chunkSize: 100
-  maxWorkers: 30
+  chunkSize: 10000
+  maxWorkers: 18
   partitionSize:
-    retDat: 300
-    retBcq: 20000
-    calcEta: 1000
-    procNss: 3000
-    nss: 3000
-    nssTot: 20000
-    disAggBcq: 4000
+    retDat: 450
+    retBcq: 44000
+    calcEta: 500
+    procNss: 1500
+    nss: 500
+    nssTot: 450000
+    disAggBcq: 1000
     disAggBcqBuyer: 1000
     disAggBcqSeller: 1000
     rta: 900

crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp.yml

@@ -49,7 +49,7 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 8192
+          memory: 4096
           cpu: 1
         dcos:
           authorizationToken: eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJkY29zX2hpc3Rvcnlfc2VydmljZSIsImV4cCI6NDY1NTE3ODM0OX0.erK7saZPxkEOP6k1S8CNvITHQ1SyEUj1cW5qx4GTQU-MPOwxMsFAcFYO0zAthXPYQSzaRxykTelkLMJTsSQVro9bGJcHua7SedIqCmq1TvAUBSJugyxsDxu07mmS-Yh7MwpmG3LAOItwCYzWhihMqdLKRA19iimAs8xS6V5uKo5U5Fq1lOAQ0ye4f4L9CgF8WWyIqILdpynLRIx_eViY5RWtqYznV8otg0jkJGsjHQQmPZa732NY0crJtDcN713wVqT4SZoG993-Zv4mH_RU0a7NbwtvFE1mCfmja1aMp_gtogdS3xdQvRcS1BzaoJs4_dGUvRoQdUeseuTbHkF6VQ

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-pemc-uat-sit.yml

@@ -28,8 +28,8 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 8192
-          cpu: 2
+          memory: 4096
+          cpu: 1
     task:
       initialize:
         enable: false

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation.yml

@@ -62,14 +62,14 @@ spring:
 
 batch:
   chunkSize: 100
-  maxWorkers: 20
+  maxWorkers: 10
   partitionSize:
     amsSp: 1500
     amsInv: 1500
     amsMf: 1500
-    energyStl: 1
+    energyStl: 5
     lr: 1
-    energyStlB: 4500
+    energyStlB: 150000
 
 
 logging:

crss-ui/crss-ui-pemc-top-sit.yml

@@ -15,4 +15,4 @@ data-extraction-service:
     listOfServers: http://crss-top-sitcrss1data-extraction-service.marathon.l4lb.thisdcos.directory:8080
 settlement-service:
   ribbon:
-    listOfServers: http://crss-top-sitcrss2crss-settlement-app.marathon.l4lb.thisdcos.directory:8082
+    listOfServers: http://crss-top-sitcrss2settlement-app.marathon.l4lb.thisdcos.directory:8082