Skip to content

Commit

Permalink
20231011@13h59
Browse files Browse the repository at this point in the history
  • Loading branch information
mdebarros authored and vijayg10 committed Oct 13, 2023
1 parent c7d6b16 commit d54b9ee
Show file tree
Hide file tree
Showing 12 changed files with 434 additions and 28 deletions.
17 changes: 10 additions & 7 deletions .env
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
## Mojaloop Docker Image Versions
ML_API_ADAPTER_VERSION=v14.0.1
# ML_API_ADAPTER_VERSION=v14.0.1
ML_API_ADAPTER_VERSION=v14.0.4
## ALS initial baseline with version included in Mojaloop v15.1.0 Helm Release
# ACCOUNT_LOOKUP_SERVICE_VERSION=v14.2.2
## ALS published version with included fix: JSON.stringify disabled in logResponse function
ACCOUNT_LOOKUP_SERVICE_VERSION=v14.2.3
## ALS snapshot release with fix: v14.2.3 + caching for validateParticipant and resolve Participants via Oracles
# ACCOUNT_LOOKUP_SERVICE_VERSION=v14.2.4-snapshot.3
QUOTING_SERVICE_VERSION=v15.1.0
# QUOTING_SERVICE_VERSION=v15.2.1
QUOTING_SERVICE_VERSION=v15.2.3-snapshot.2
## CL initial baseline with version included in Mojaloop v15.1.0 Helm Release
CENTRAL_LEDGER_VERSION=v17.2.0
# CENTRAL_LEDGER_VERSION=v17.2.0
CENTRAL_LEDGER_VERSION=v17.2.1
## CL snapshot release with included fix: JSON.stringify disabled in logResponse function
# CENTRAL_LEDGER_VERSION=v17.0.4-snapshot.0
## Central Ledger version with batch processing capability
Expand Down Expand Up @@ -42,8 +45,8 @@ K6_VERSION=0.45.0
## Performance Testing Replicas
QS_REPLICAS=1
ALS_REPLICAS=1
CENTRAL_LEDGER_GENERAL_REPLICAS=4
CENTRAL_LEDGER_POSITION_REPLICAS=8
CENTRAL_LEDGER_GENERAL_REPLICAS=1
CENTRAL_LEDGER_POSITION_REPLICAS=1
CENTRAL_LEDGER_POSITION_BATCH_REPLICAS=0
ML_API_ADAPTER_REPLICAS=4
ML_NOTIFICATION_REPLICAS=4
ML_API_ADAPTER_REPLICAS=1
ML_NOTIFICATION_REPLICAS=1
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ docker compose --project-name monitoring -f docker-compose-monitoring.yml up -d
Stop Monitoring Services

```bash
docker compose --project-name monitoring --profile als-test -f docker-compose-monitoring.yml down -v
docker compose --project-name monitoring --profile als-test --profile transfers-test -f docker-compose-monitoring.yml down -v
```

Start monitoring with account lookup service mysql exporter
Expand Down
2 changes: 1 addition & 1 deletion automate_perf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ declare -a dashboards=(\
"Official%20k6%20Test%20Result" \
"MySQL%20Overview" \
"Supporting%20Services%20-%20Callback%20Hander%20Service" \
"mojaloop-quoting-service"
"Mojaloop%20-%20Quoting%20Service"
)

# # create a directory to store the results with date timestamp in the name, check if the directory exists
Expand Down
18 changes: 9 additions & 9 deletions docker-compose-perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ services:
deploy:
mode: replicated
replicas: ${CENTRAL_LEDGER_GENERAL_REPLICAS}
command: sh -c "/opt/app/config-modifier/run.js /opt/app/config/default.json /opt/app/config-modifier/configs/central-ledger-disabled-handlers.js /opt/app/config/default.json && /opt/app/wait4/wait4.js central-ledger && node src/api/index.js"
command: sh -c "/opt/app/config-modifier/run.js /opt/app/config/default.json /opt/app/config-modifier/configs/$$CONF_CL_SVC /opt/app/config/default.json && /opt/app/wait4/wait4.js central-ledger && node src/api/index.js"
# ports:
# - "3001:3001"
volumes:
Expand Down Expand Up @@ -186,7 +186,7 @@ services:
deploy:
mode: replicated
replicas: ${CENTRAL_LEDGER_GENERAL_REPLICAS}
command: sh -c "/opt/app/config-modifier/run.js /opt/app/config/default.json /opt/app/config-modifier/configs/central-handlers.js /opt/app/config/default.json && /opt/app/wait4/wait4.js central-ledger && node src/handlers/index.js handler --prepare"
command: sh -c "/opt/app/config-modifier/run.js /opt/app/config/default.json /opt/app/config-modifier/configs/$$CONF_CL_HANDLER_PREPARE /opt/app/config/default.json && /opt/app/wait4/wait4.js central-ledger && node src/handlers/index.js handler --prepare"
# ports:
# - "3001:3001"
volumes:
Expand Down Expand Up @@ -230,7 +230,7 @@ services:
deploy:
mode: replicated
replicas: ${CENTRAL_LEDGER_POSITION_REPLICAS}
command: sh -c "/opt/app/config-modifier/run.js /opt/app/config/default.json /opt/app/config-modifier/configs/central-handlers.js /opt/app/config/default.json && /opt/app/wait4/wait4.js central-ledger && node src/handlers/index.js handler --position"
command: sh -c "/opt/app/config-modifier/run.js /opt/app/config/default.json /opt/app/config-modifier/configs/$$CONF_CL_HANDLER_POSITION /opt/app/config/default.json && /opt/app/wait4/wait4.js central-ledger && node src/handlers/index.js handler --position"
# ports:
# - "3001:3001"
volumes:
Expand Down Expand Up @@ -274,7 +274,7 @@ services:
deploy:
mode: replicated
replicas: ${CENTRAL_LEDGER_POSITION_BATCH_REPLICAS}
command: sh -c "/opt/app/config-modifier/run.js /opt/app/config/default.json /opt/app/config-modifier/configs/central-handlers.js /opt/app/config/default.json && /opt/app/wait4/wait4.js central-ledger && node src/handlers/index.js handler --positionbatch"
command: sh -c "/opt/app/config-modifier/run.js /opt/app/config/default.json /opt/app/config-modifier/configs/$$CONF_CL_HANDLER_POSITION_BATCH /opt/app/config/default.json && /opt/app/wait4/wait4.js central-ledger && node src/handlers/index.js handler --positionbatch"
# ports:
# - "3001:3001"
volumes:
Expand Down Expand Up @@ -314,7 +314,7 @@ services:
deploy:
mode: replicated
replicas: ${CENTRAL_LEDGER_GENERAL_REPLICAS}
command: sh -c "/opt/app/config-modifier/run.js /opt/app/config/default.json /opt/app/config-modifier/configs/central-handlers.js /opt/app/config/default.json && /opt/app/wait4/wait4.js central-ledger && node src/handlers/index.js handler --fulfil"
command: sh -c "/opt/app/config-modifier/run.js /opt/app/config/default.json /opt/app/config-modifier/configs/$$CONF_CL_HANDLER_FULFIL /opt/app/config/default.json && /opt/app/wait4/wait4.js central-ledger && node src/handlers/index.js handler --fulfil"
# ports:
# - "3001:3001"
volumes:
Expand Down Expand Up @@ -435,7 +435,7 @@ services:
deploy:
mode: replicated
replicas: 1 # We dont need to scale this unless we are testing funds-in/out
command: sh -c "/opt/app/config-modifier/run.js /opt/app/config/default.json /opt/app/config-modifier/configs/central-handlers.js /opt/app/config/default.json && /opt/app/wait4/wait4.js central-ledger && node src/handlers/index.js handler --admin"
command: sh -c "/opt/app/config-modifier/run.js /opt/app/config/default.json /opt/app/config-modifier/configs/$$CONF_CL_HANDLER_ADMIN /opt/app/config/default.json && /opt/app/wait4/wait4.js central-ledger && node src/handlers/index.js handler --admin"
# ports:
# - "3001:3001"
volumes:
Expand Down Expand Up @@ -640,7 +640,7 @@ services:
mode: replicated
replicas: ${ML_API_ADAPTER_REPLICAS}
# container_name: ml-api-adapter
command: sh -c "/opt/app/config-modifier/run.js /opt/app/config/default.json /opt/app/config-modifier/configs/ml-api-adapter-disabled-handlers.js /opt/app/config/default.json && /opt/app/wait4/wait4.js ml-api-adapter && node src/api/index.js"
command: sh -c "/opt/app/config-modifier/run.js /opt/app/config/default.json /opt/app/config-modifier/configs/$$CONF_ML_API_ADAPTER /opt/app/config/default.json && /opt/app/wait4/wait4.js ml-api-adapter && node src/api/index.js"
# ports:
# - "3000:3000"
volumes:
Expand All @@ -649,7 +649,7 @@ services:
environment:
# - LOG_LEVEL=error
- EVENT_SDK_TRACEID_PER_VENDOR=false
# - MLAPI_TRANSFERS__SEND_TRANSFER_CONFIRMATION_TO_PAYEE=false
- MLAPI_TRANSFERS__SEND_TRANSFER_CONFIRMATION_TO_PAYEE=false
networks:
- mojaloop-net
depends_on:
Expand Down Expand Up @@ -678,7 +678,7 @@ services:
deploy:
mode: replicated
replicas: ${ML_NOTIFICATION_REPLICAS}
command: sh -c "/opt/app/config-modifier/run.js /opt/app/config/default.json /opt/app/config-modifier/configs/ml-handler-notification.js /opt/app/config/default.json && /opt/app/wait4/wait4.js ml-api-adapter && node src/handlers/index.js handler --notification"
command: sh -c "/opt/app/config-modifier/run.js /opt/app/config/default.json /opt/app/config-modifier/configs/$$CONF_ML_HANDLER_NOTIFY /opt/app/config/default.json && /opt/app/wait4/wait4.js ml-api-adapter && node src/handlers/index.js handler --notification"
# ports:
# - "3000:3000"
# - "9229:9229"
Expand Down
205 changes: 205 additions & 0 deletions docker/config-modifier/configs/central-handlers-kafka.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
module.exports = {
"HOSTNAME": "http://central-ledger",
"DATABASE": {
"HOST": "mysql-cl"
},
"MIGRATIONS": {
"DISABLED": true,
"RUN_DATA_MIGRATIONS": true
},
"MONGODB": {
"DISABLED": true,
"HOST": "objstore",
"PORT": 27017,
"USER": "",
"PASSWORD": "",
"DATABASE": "mlos"
},
"CACHE": {
"CACHE_ENABLED": true,
"MAX_BYTE_SIZE": 10000000,
"EXPIRES_IN_MS": 1000
},
"KAFKA": {
"CONSUMER": {
"BULK": {
"PREPARE": {
"config": {
"options": {
"sync": false,
},
"rdkafkaConf": {
"metadata.broker.list": "kafka:29092"
}
}
},
"PROCESSING": {
"config": {
"options": {
"sync": false,
},
"rdkafkaConf": {
"metadata.broker.list": "kafka:29092"
}
}
},
"FULFIL": {
"config": {
"options": {
"sync": false,
},
"rdkafkaConf": {
"metadata.broker.list": "kafka:29092"
}
}
},
"GET": {
"config": {
"options": {
"sync": false,
},
"rdkafkaConf": {
"metadata.broker.list": "kafka:29092"
}
}
}
},
"TRANSFER": {
"PREPARE": {
"config": {
"options": {
"sync": false,
},
"rdkafkaConf": {
"metadata.broker.list": "kafka:29092"
}
}
},
"GET": {
"config": {
"options": {
"sync": false,
},
"rdkafkaConf": {
"metadata.broker.list": "kafka:29092"
}
}
},
"FULFIL": {
"config": {
"options": {
"sync": false,
},
"rdkafkaConf": {
"metadata.broker.list": "kafka:29092"
}
}
},
"POSITION": {
"config": {
"options": {
"sync": false,
},
"rdkafkaConf": {
"metadata.broker.list": "kafka:29092"
}
}
}
},
"ADMIN": {
"TRANSFER": {
"config": {
"options": {
"sync": false,
},
"rdkafkaConf": {
"metadata.broker.list": "kafka:29092"
}
}
}
}
},
"PRODUCER": {
"BULK": {
"PROCESSING": {
"config": {
"options": {
"sync": false,
},
"rdkafkaConf": {
"queue.buffering.max.messages": 0,
"compression.codec": "lz4",
"metadata.broker.list": "kafka:29092"
}
}
}
},
"TRANSFER": {
"PREPARE": {
"config": {
"options": {
"sync": false,
},
"rdkafkaConf": {
"queue.buffering.max.messages": 0,
"compression.codec": "lz4",
"metadata.broker.list": "kafka:29092"
}
}
},
"FULFIL": {
"config": {
"options": {
"sync": false,
},
"rdkafkaConf": {
"queue.buffering.max.messages": 0,
"compression.codec": "lz4",
"metadata.broker.list": "kafka:29092"
}
}
},
"POSITION": {
"config": {
"options": {
"sync": false,
},
"rdkafkaConf": {
"queue.buffering.max.messages": 0,
"compression.codec": "lz4",
"metadata.broker.list": "kafka:29092"
}
}
}
},
"NOTIFICATION": {
"EVENT": {
"config": {
"options": {
"sync": false,
},
"rdkafkaConf": {
"queue.buffering.max.messages": 0,
"compression.codec": "lz4",
"metadata.broker.list": "kafka:29092"
}
}
}
},
"ADMIN": {
"TRANSFER": {
"config": {
"options": {
"sync": false,
},
"rdkafkaConf": {
"queue.buffering.max.messages": 0,
"compression.codec": "lz4",
"metadata.broker.list": "kafka:29092"
}
}
}
}
}
}
}
5 changes: 5 additions & 0 deletions docker/config-modifier/configs/central-handlers.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ module.exports = {
"PASSWORD": "",
"DATABASE": "mlos"
},
"CACHE": {
"CACHE_ENABLED": true,
"MAX_BYTE_SIZE": 10000000,
"EXPIRES_IN_MS": 1000
},
"KAFKA": {
"CONSUMER": {
"BULK": {
Expand Down
Loading

0 comments on commit d54b9ee

Please sign in to comment.