Sfoglia il codice sorgente

update stl job configs for azure env

dmendoza 8 anni fa
parent
commit
e0c9cee652

+ 29 - 19
crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-azure.yml

@@ -5,46 +5,35 @@ spring:
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
+      maximumPoolSize: 2
   crss-main:
     datasource:
       driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      maximumPoolSize: 2
   crss-metering:
     datasource:
       driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
       username: crss_metering
       password: crss_metering
+      maximumPoolSize: 2
   crss-nmms:
     datasource:
       driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
+      maximumPoolSize: 2
   crss-dataflow:
     datasource:
       driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-      
-  jpa:
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto:
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
+      maximumPoolSize: 5
 
   profiles:
     include: mesos
@@ -52,9 +41,8 @@ spring:
     deployer:
       mesos:
         chronos:
-          apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 4096
-          cpu: 2
+          memory: 2048
+          cpu: 0.5
     task:
       initialize:
         enable: false
@@ -63,3 +51,25 @@ spring:
       enabled: false
     job:
       enabled: true
+
+  jpa:
+    show-sql: false
+    generate-ddl: false
+    properties:
+      hibernate:
+        generate_statistics: false
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+
+logging:
+  level:
+    com.pemc.crss.settlement.task.calculation.addtlcomp: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug

+ 53 - 18
crss-settlement-task-calculation/crss-settlement-task-calculation-azure.yml

@@ -5,45 +5,36 @@ spring:
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
+      maximumPoolSize: 2
   crss-main:
     datasource:
       driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
+      maximumPoolSize: 2
   crss-metering:
     datasource:
       driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=metering
       username: crss_metering
       password: crss_metering
+      maximumPoolSize: 2
   crss-nmms:
     datasource:
       driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: crss_nmms
+      maximumPoolSize: 2
   crss-dataflow:
     datasource:
       driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-
-  jpa:
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto:
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
+      maximumPoolSize: 5
+      connectionTimeout: 300000
 
   profiles:
     include: mesos
@@ -51,9 +42,9 @@ spring:
     deployer:
       mesos:
         chronos:
-          apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 4096
-          cpu: 2
+          memory: 2048
+          cpu: 0.5
+
     task:
       initialize:
         enable: false
@@ -62,3 +53,47 @@ spring:
       enabled: false
     job:
       enabled: true
+
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: false
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: none
+        hbm2ddl:
+          auto: none
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    port: 6379
+
+batch:
+  chunkSize: 100
+  maxWorkers: 10
+  partitionSize:
+    retDat: 900
+    retBcq: 20000
+    calcEta: 3000
+    procNss: 3000
+    nss: 1000
+    disAggBcq: 1000
+    disAggBcqBuyer: 1000
+    disAggBcqSeller: 1000
+    rta: 300
+    rprta: 1000
+    rcra: 200
+    sFactor: 150
+    runway: 150
+    spotSeller: 1500
+    spotBuyer: 1500
+    gmr: 1500
+
+
+logging:
+  level:
+    com.pemc.crss.settlement.task.calculation: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug

+ 11 - 1
crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-azure.yml

@@ -11,9 +11,19 @@ spring:
       username: crss_dataflow
       password: crss_dataflow
       driverClassName: "${spring.datasource.driverClassName}"
+      maximumPoolSize: 5
   crss-main:
     datasource:
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      driverClassName: "${spring.datasource.driverClassName}"
+      driverClassName: "${spring.datasource.driverClassName}"
+
+  profiles:
+    include: mesos
+  cloud:
+    deployer:
+      mesos:
+        chronos:
+          memory: 2048
+          cpu: 0.5

+ 9 - 19
crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-azure.yml

@@ -5,35 +5,25 @@ spring:
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: crss_settlement
-      maxPoolSize: 20
   crss-dataflow:
     datasource:
       driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-      maxPoolSize: 20
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
-      connectionTimeout: 10000
-      maxPoolSize: 20
+      maximumPoolSize: 5
   crss-main:
     datasource:
       driverClassName: "${spring.datasource.driverClassName}"
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: crss_meterprocess
-      connectionTimeout: 10000
-      maxPoolSize: 20
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
 
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
+  profiles:
+    include: mesos
+  cloud:
+    deployer:
+      mesos:
+        chronos:
+          memory: 2048
+          cpu: 0.5

+ 24 - 19
crss-settlement-task-validation/crss-settlement-task-validation-azure.yml

@@ -11,13 +11,6 @@ spring:
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=registration
       username: crss_registration
       password: crss_registration
-  # for removal after ITER 7 stl testing
-  crss-meterprocess:
-    datasource:
-      driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=meterprocess
-      username: crss_meterprocess
-      password: crss_meterprocess
   crss-main:
     datasource:
       driverClassName: "${spring.datasource.driverClassName}"
@@ -42,24 +35,16 @@ spring:
       jdbcUrl: jdbc:postgresql://10.64.0.4:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-  jpa:
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto:
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-
-
+      maximumPoolSize: 5
   profiles:
     include: mesos
+
   cloud:
     deployer:
       mesos:
         chronos:
-          apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 4096
-          cpu: 2
+          memory: 2048
+          cpu: 0.5
     task:
       initialize:
         enable: false
@@ -68,3 +53,23 @@ spring:
       enabled: false
     job:
       enabled: true
+
+  jpa:
+    show-sql: false
+    generate-ddl: false
+    properties:
+      hibernate:
+        generate_statistics: false
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
+          auto:
+
+
+logging:
+  level:
+    com.pemc.crss.settlement.task.validation: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: DEBUG