Skip to content

Commit

Permalink
Merge pull request #216 from xtuml/213_deprecate_AER_AsyncLogger
Browse files Browse the repository at this point in the history
213 deprecate aer async logger
  • Loading branch information
cortlandstarrett authored May 21, 2024
2 parents 4711b5f + 83eafa7 commit 8bd4168
Show file tree
Hide file tree
Showing 62 changed files with 39 additions and 7,414 deletions.
28 changes: 5 additions & 23 deletions deploy/docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ services:
volumes:
- "../models/PV_PROC/schedule:/root/schedule"
- "./config:/root/config"
- "./JM_PROC-db:/root/JM_PROC-db"
ulimits:
sigpending: -1
logging:
Expand Down Expand Up @@ -44,43 +43,26 @@ services:
volumes:
- "../models/PV_PROC/schedule:/root/schedule"
- "./config:/root/config"
- "./InvariantStore:/root/InvariantStore"
ulimits:
sigpending: -1
logging:
driver: local
working_dir: /root
command: AEO_SVDC_PROC_transient -configFile ${CONFIG_FILE:-pv-config.json} -util Kafka -kafka-broker-list kafka:9093 -util MetaData

async_logger:
image: ghcr.io/xtuml/protocol_verifier:latest
depends_on:
kafka:
condition: service_healthy
volumes:
- "./config:/root/config"
- "./logs/verifier:/var/log/verifier"
- "./logs/reception:/var/log/reception"
ulimits:
sigpending: -1
logging:
driver: local
working_dir: /root
command: LOGGER_PROC_transient -log-config config/log-config-pv-proc.properties -util Kafka -kafka-broker-list kafka:9093 -util MetaData

zookeeper:
image: wurstmeister/zookeeper:3.4.6
image: levistarrett/zookeeper:3.4.6
ports:
- "2181:2181"

kafka:
image: wurstmeister/kafka
image: levistarrett/kafka
ports:
- "9092:9092"
expose:
- "9093"
healthcheck:
test: /opt/kafka/bin/kafka-topics.sh --bootstrap-server kafka:9093 --topic JobManagement_service0,AEOrdering_service0,IStore_service0 --describe
test: /opt/kafka/bin/kafka-topics.sh --bootstrap-server kafka:9093 --topic Protocol_Verifier_Reception,AEOrdering_service0,IStore_service0 --describe
interval: 10s
environment:
KAFKA_ADVERTISED_LISTENERS: INSIDE://kafka:9093,OUTSIDE://localhost:9092
Expand All @@ -93,12 +75,12 @@ services:
# KAFKA_LOG_ROLL_MS: 60000 # roll the log every minute
KAFKA_LOG_SEGMENT_DELETE_DELAY_MS: 1 # delete immediately after log roll
KAFKA_LOG_RETENTION_CHECK_INTERVAL_MS: 10000 # check the retention condition every 10 seconds
KAFKA_CREATE_TOPICS: "JobManagement_service0:1:1,JobManagement_service1:1:1,JobManagement_service2:1:1,JobManagement_service3:1:1,JobManagement_service4:1:1,JobManagement_service5:1:1,JobManagement_service6:1:1,AEOrdering_service0:1:1,AEOrdering_service1:1:1,AEOrdering_service2:1:1,AEOrdering_service3:1:1,AEOrdering_service4:1:1,AEOrdering_service5:1:1,AEOrdering_service6:1:1,AEOrdering_service7:1:1,AEOrdering_service8:1:1,AEOrdering_service9:1:1,AESequenceDC_service12:1:1,AESequenceDC_service31:1:1,IStore_service0:1:1,IStore_service1:1:1,IStore_service2:1:1,IStore_service3:1:1,IStore_service4:1:1,BenchmarkingProbe_service0:1:1,AsyncLogger_service0:1:1,AsyncLogger_service1:1:1,AsyncLogger_service2:1:1,AsyncLogger_service3:1:1,AsyncLogger_service4:1:1,AsyncLogger_service5:1:1,AsyncLogger_service6:1:1,AsyncLogger_service7:1:1,AsyncLogger_service8:1:1,AsyncLogger_service9:1:1,AsyncLogger_service10:1:1,AsyncLogger_service11:1:1,AsyncLogger_service12:1:1,AsyncLogger_service13:1:1,AsyncLogger_service14:1:1,AsyncLogger_service15:1:1"
KAFKA_CREATE_TOPICS: "Protocol_Verifier_Reception:1:1,Protocol_Verifier_InfoWarn:1:1,Protocol_Verifier_Statistics:1:1,Protocol_Verifier_VGateway:1:1,JobManagement_service0:1:1,JobManagement_service1:1:1,JobManagement_service2:1:1,JobManagement_service3:1:1,JobManagement_service4:1:1,JobManagement_service5:1:1,JobManagement_service6:1:1,AEOrdering_service0:1:1,AEOrdering_service1:1:1,AEOrdering_service2:1:1,AEOrdering_service3:1:1,AEOrdering_service4:1:1,AEOrdering_service5:1:1,AEOrdering_service6:1:1,AEOrdering_service7:1:1,AEOrdering_service8:1:1,AEOrdering_service9:1:1,AESequenceDC_service12:1:1,AESequenceDC_service31:1:1,IStore_service0:1:1,IStore_service1:1:1,IStore_service2:1:1,IStore_service3:1:1,IStore_service4:1:1,BenchmarkingProbe_service0:1:1"
volumes:
- /var/run/docker.sock:/var/run/docker.sock

kafka_config:
image: wurstmeister/kafka
image: levistarrett/kafka
depends_on:
kafka:
condition: service_healthy
Expand Down
24 changes: 24 additions & 0 deletions deploy/runtime.txt
Original file line number Diff line number Diff line change
Expand Up @@ -199,3 +199,27 @@ stop Fri May 10 14:05:44 EDT 2024
start Fri May 10 14:16:17 EDT 2024 1000000 at 4000 on cort15air-2.local
stop Fri May 10 14:26:22 EDT 2024
605 seconds at rate: 1652
start Fri May 10 15:33:59 EDT 2024 100000 at 4000 on cort15air-2.local
stop Fri May 10 15:35:00 EDT 2024
61 seconds at rate: 1639
start Sat May 11 00:06:08 UTC 2024 4000000 at 1200 on ip-172-31-25-77
stop Sat May 11 02:09:41 UTC 2024
7413 seconds at rate: 539
start Sat May 11 12:41:27 UTC 2024 8000000 at 1200 on ip-172-31-25-77
stop Sat May 11 16:29:43 UTC 2024
13696 seconds at rate: 584
start Mon May 13 10:49:23 EDT 2024 100000 at 2000 on cort15air-2.local
stop Mon May 13 10:50:54 EDT 2024
91 seconds at rate: 1098
start Mon May 13 11:35:24 EDT 2024 100000 at 2000 on cort15air-2.local
stop Mon May 13 11:37:00 EDT 2024
96 seconds at rate: 1041
start Mon May 20 16:04:37 EDT 2024 100000 at 2000 on cort15air-2.local
stop Mon May 20 16:06:08 EDT 2024
91 seconds at rate: 1098
start Mon May 20 16:07:54 EDT 2024 1000000 at 2000 on cort15air-2.local
stop Mon May 20 16:23:12 EDT 2024
918 seconds at rate: 1089
start Tue May 21 10:44:36 EDT 2024 1000000 at 4000 on cort15air-2.local
stop Tue May 21 10:54:43 EDT 2024
607 seconds at rate: 1647
8 changes: 4 additions & 4 deletions doc/howto/HOWTO_Munin.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ repository from GitHub. Follow the steps from the guide linked in the
workspace:

* Protocol Verifier Domains
** AEReception (AER)
** JobManagement (JM)
** AEOrdering (AEO)
** FileReception (FR) - only required if input event streams are file based
** SequenceVerificationDataCentric (SVDC)
Expand Down Expand Up @@ -621,7 +621,7 @@ steps to building and running the projects:

Before getting into the actual build, it is often an instructive process to
go through the project structure file by file and explore the purpose of each
file in the context of the build. We will use the `AEReception` domain for this.
file in the context of the build. We will use the `JobManagement` domain for this.
Each of the other domains follows a similar pattern. Not every file/directory
seen here will exist in each domain project.

Expand All @@ -633,7 +633,7 @@ byproducts of the build that should not be committed to the repository (e.g.
build logs, test results). Not every one of these files will be covered in the
section below, but it is good to be aware of them.

AEReception/
JobManagement/
▸ build/
▸ config/
▾ gen/
Expand All @@ -652,7 +652,7 @@ section below, but it is good to be aware of them.
conanfile.py
test.env

For a visual overview of the directory structure for the AEReception domain
For a visual overview of the directory structure for the JobManagement domain
click link:images/AEReception_Directory_Structure.pdf[here]. TODO Update the diagram

==== `build`
Expand Down
4 changes: 2 additions & 2 deletions doc/howto/HOWTO_p2j.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ Play Examples:
python plus2json.pyz --play -o job_definitions puml/*.puml
# run the play option on the set of 'puml' files represented by $puml_files and generate a
# stream of events to the Kafka message broker on port 9092 using topic default.AEReception_service0.
# stream of events to the Kafka message broker on port 9092 using topic Protocol_Verifier_Reception.
# The events will be shuffled in order and a total of 100000 will be sent at the rate of
# 1000 events per second
python plus2json.pyz --play $puml_files --msgbroker localhost:9092 --topic default.AEReception_service0
python plus2json.pyz --play $puml_files --msgbroker localhost:9092 --topic Protocol_Verifier_Reception
--shuffle --rate 1000 --num-events 100000
TODO Question: What tells p2j to keep generating events rather than just generate one set of events? Is
Expand Down
1 change: 0 additions & 1 deletion models/AEReception/.dependencies

This file was deleted.

10 changes: 0 additions & 10 deletions models/AEReception/.gitignore

This file was deleted.

18 changes: 0 additions & 18 deletions models/AEReception/.project

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions models/AEReception/.settings/org.eclipse.core.resources.prefs

This file was deleted.

2 changes: 0 additions & 2 deletions models/AEReception/.settings/org.eclipse.core.runtime.prefs

This file was deleted.

31 changes: 0 additions & 31 deletions models/AEReception/conanfile.py

This file was deleted.

6 changes: 0 additions & 6 deletions models/AEReception/config/config.json

This file was deleted.

8 changes: 0 additions & 8 deletions models/AEReception/config/test_config.json

This file was deleted.

1 change: 0 additions & 1 deletion models/AEReception/gen/.gitignore

This file was deleted.

3 changes: 0 additions & 3 deletions models/AEReception/gen/README.adoc

This file was deleted.

9 changes: 0 additions & 9 deletions models/AEReception/gen/application.mark

This file was deleted.

5 changes: 0 additions & 5 deletions models/AEReception/gen/features.mark

This file was deleted.

2 changes: 0 additions & 2 deletions models/AEReception/masl/.gitignore

This file was deleted.

Loading

0 comments on commit 8bd4168

Please sign in to comment.