Skip to content

Memory leak #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
craig8 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Memory leak #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
94a0432
Add configuration files from gridappsd for testing
craig8 Nov 14, 2024
5aac6c2
Instrument tcp connection/disconnection.
craig8 Nov 14, 2024
cb41b9f
Update GossClient subscription.
craig8 Nov 14, 2024
521b1a0
Add run-server.bndrun to the project.
craig8 Nov 14, 2024
3e8dd5e
Update bnd to not include date.
craig8 Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139,616 changes: 69,808 additions & 69,808 deletions cnf/releaserepo/index.xml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cnf/releaserepo/index.xml.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
09d0338768762e1375192d9c6fbb8d7f2afbd12f02bc9f0afb41be31753ebbb8
553c145ca21126b7e9bb00ebc98e9ff8383970ccfb12aa59a30d183a37a0f6e7
7 changes: 7 additions & 0 deletions pnnl.goss.core/conf/org.apache.felix.http.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
org.apache.felix.http.debug = true
org.osgi.service.http.port = 8181
org.apache.felix.http.enable = true

org.apache.felix.http.jettyEnabled = true
org.apache.felix.http.whiteboardEnabled = true
org.apache.felix.http.cometdEnabled = true
46 changes: 46 additions & 0 deletions pnnl.goss.core/conf/org.ops4j.pax.logging.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Root logger option
# NOTE: all of the appenders should be listed here and then can be overwritten below
# using the threshold
log4j.rootLogger=DEBUG, file, stdout

# To change log level of any of the appenders use the following for example.
# log4j.appender.stdout.threshold = INFO, DEBUG, TRACE, WARN



# Direct log messages to a log file
log4j.appender.file=org.apache.log4j.RollingFileAppender
log4j.appender.file.File=log/gridappsd.log
log4j.appender.file.MaxFileSize=1MB
log4j.appender.file.MaxBackupIndex=1
log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
#%d{ABSOLUTE} %5p %c{1}:%L - %m%n

log4j.appender.stdout=org.apache.log4j.ConsoleAppender

# Shortcuts to log output from (https://logging.apache.org/log4j/1.x/apidocs/org/apache/log4j/PatternLayout.html)
#
# - %t thread used to create message
# - %p output priority (DEBUG, INFO, WARN etc.
# - %c The qualified class
# - %L the line number for the logging event.

log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} | %-5p | %-30.30t | %50.50c:%5.5L | %m%n
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.threshold=INFO

# Apache shiro logger
log4j.logger.org.apache.shiro = WARN, file
log4j.additivity.org.apache.shiro = false

# ActiveMQ logger
log4j.logger.org.apache.activemq = INFO, file
log4j.additivity.org.apache.activemq = false

# Apache http logger
log4j.logger.org.apache.http = WARN, file
log4j.additivity.org.apache.http = false

log4j.category.pnnl.goss.core.security = INFO, file

6 changes: 3 additions & 3 deletions pnnl.goss.core/conf/pnnl.goss.core.client.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# replaced with values from a global goss.properties file.

# The following are used for the core-client connection.
goss.openwire.uri = tcp://${activemq.host}:${openwire.port}
goss.stomp.uri = stomp://${activemq.host}:${stomp.port}
goss.ws.uri = ws://${activemq.host}:${ws.port}
goss.openwire.uri = tcp://0.0.0.0:61616
goss.stomp.uri = stomp://0.0.0.0:61613
goss.ws.uri = ws://0.0.0.0:61614
7 changes: 7 additions & 0 deletions pnnl.goss.core/conf/pnnl.goss.core.security.rolefile.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
admin=queue:*,topic:*,temp-queue:*,fusion:*:read,fusion:*:write
operator=queue:*,topic:*,temp-queue:*,fusion:*:read,fusion:*:write
evaluator=queue:*,topic:*,temp-queue:*,fusion:*:read,fusion:*:write
testmanager=queue:*,topic:*,temp-queue:*,fusion:*:read,fusion:*:write
application=queue:*,topic:*,temp-queue:*,fusion:*:read,fusion:*:write
service=queue:*,topic:*,temp-queue:*,fusion:*:read,fusion:*:write

1 change: 1 addition & 0 deletions pnnl.goss.core/conf/pnnl.goss.core.security.systemrealm.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
load=true
1 change: 1 addition & 0 deletions pnnl.goss.core/conf/pnnl.goss.core.security.unauthrealm.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
load=true
24 changes: 24 additions & 0 deletions pnnl.goss.core/conf/pnnl.goss.core.security.userfile.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
system=manager,admin,operator,evaluator,testmanager,application,service
operator1=operator,operator
operator2=operator,operator
operator3=operator,operator
evaluator1=evaluator,evaluator
evaluator2=evaluator,evaluator
testmanager1=testmanager,testmanager
testmanager2=testmanager,testmanager
app_reg=1234App,application,admin
app_user=1234App,application,admin
service_reg=1234Svc,service,admin
service_user=1234Svc,service,admin
test_sys_user=1Test,admin,operator,evaluator,testmanager,application,service
test_oper_user=2Test,operator
test_eval_user=3Test,evaluator
test_app_user=4Test,application
test_svc_user=5Test,service
tutorial_user=12345!,admin,operator,evaluator,testmanager,application,service






22 changes: 22 additions & 0 deletions pnnl.goss.core/conf/pnnl.goss.core.server.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Configuration for the goss-core module. Each jar in
# goss-core can be configured using the following. During
# compilation 'mvn compile' the place holders @@ will be
# replaced with values from a global goss.properties file.


# The following are used for the core-client connection.
goss.openwire.uri = tcp://0.0.0.0:61616
goss.stomp.uri = stomp://0.0.0.0:61613
goss.ws.uri = ws://0.0.0.0:61614?websocket.maxTextMessageSize=999999
goss.ssl.uri = ssl://0.0.0.0:61443

goss.start.broker = true
goss.broker.file = ${activemq.broker.file}

# Used in the core-ssl.bndrun file
client.keystore = ${client.keystore}
client.keystore.password = ${client.keystore.password}
client.truststore = ${client.truststore}
client.truststore.password = ${client.truststore.password}
ssl.enabled = false

38 changes: 38 additions & 0 deletions pnnl.goss.core/conf/pnnl.goss.gridappsd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
fncs.path = fncs_broker
gridlabd.path = gridlabd.sh
gridappsd.temp.path = /tmp/gridappsd_tmp
fncs.bridge.path = ./scripts/goss_fncs_bridge.py
applications.path = /gridappsd/applications
services.path = /gridappsd/services
# Requires no /
blazegraph.ns.path = http://localhost:8889/bigdata/namespace/kb/sparql

# Uses docker composed blazegraph host here. Note this is not the
# external address, but from inside one of the containers on the
# docker-compose default network.
blazegraph.host.path = http://blazegraph:8080/bigdata/namespace/kb/sparql

# Deprecated original path
# Uses docker composed proven host here. Note this is not the
# external address, but from inside one of the containers on the
# docker-compose default network.
proven.path = http://proven:8080/hybrid/rest/v1/repository/provenMessage

# Uses docker composed proven host here. Note this is not the
# external address, but from inside one of the containers on the
# docker-compose default network.
proven.write.path = http://proven:8080/hybrid/rest/v1/repository/addBulkTimeSeries

# Uses docker composed proven host here. Note this is not the
# external address, but from inside one of the containers on the
# docker-compose default network.
proven.query.path = http://proven:8080/hybrid/rest/v1/repository/provenMessage

# Uses docker composed proven host here. Note this is not the
# external address, but from inside one of the containers on the
# docker-compose default network.
proven.advanced_query.path = http://proven:8080/hybrid/rest/v1/repository/getAdvancedTsQuery


# Power grid model MRID for deployed Field Bus
field.model.mrid = _49AD8E07-3BF9-A4E2-CB8F-C3722F837B62
17 changes: 17 additions & 0 deletions pnnl.goss.core/conf/pnnl.goss.security.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Configuration for the goss-core module. Each jar in
# goss-core can be configured using the following. During
# compilation 'mvn compile' the place holders @@ will be
# replaced with values from a global goss.properties file.

# This user is equivelant to root. Must have '*'
# permissions on the message bus.
goss.system.manager = system
goss.system.manager.password = manager

# Used in the core-ssl.bndrun file
client.keystore = ${client.keystore}
client.keystore.password = ${client.keystore.password}
client.truststore = ${client.truststore}
client.truststore.password = ${client.truststore.password}
ssl.enabled = false

28 changes: 28 additions & 0 deletions pnnl.goss.core/conf/pnnl.goss.sql.datasource.gridappsd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# For the powergrid all datasources that have a name that starts with powergrid
# will be interrogated for powergrids.

# The name that can be returned from the datasource registry handler.
# Required
name=gridappsd

# A username to access the database
# Required
username=gridappsd
password=gridappsd1234

# A password to access the database
# Required
password=gridappsd1234

# A jdbc or other url string to be require to connect to the database
# Required
# Uses the container named mysql to connect to.
url=jdbc:mysql://mysql:3306/gridappsd
#url=jdbc:mysql://localhost:3306/gridappsd

# The class to use to create the datasource (Note this class must be available
# through osgi in order to use it).
# Optional - Defaults to com.mysql.jdbc.Driver
driver=com.mysql.jdbc.Driver


50 changes: 50 additions & 0 deletions pnnl.goss.core/conf/rwstore.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#
# Note: These options are applied when the journal and the triple store are
# first created.

##
## Journal options.
##
com.bigdata.rwstore.RWStore.readBlobsAsync=false

# The backing file. This contains all your data. You want to put this someplace
# safe. The default locator will wind up in the directory from which you start
# your servlet container.
com.bigdata.journal.AbstractJournal.file=blazegraph.jnl

# The persistence engine. Use 'Disk' for the WORM or 'DiskRW' for the RWStore.
com.bigdata.journal.AbstractJournal.bufferMode=DiskRW

# Setup for the RWStore recycler rather than session protection.
com.bigdata.service.AbstractTransactionService.minReleaseAge=1

# Enable group commit. See http://wiki.blazegraph.com/wiki/index.php/GroupCommit
com.bigdata.journal.Journal.groupCommit=false

com.bigdata.btree.writeRetentionQueue.capacity=4000
com.bigdata.btree.BTree.branchingFactor=128

# 200M initial extent.
com.bigdata.journal.AbstractJournal.initialExtent=209715200
com.bigdata.journal.AbstractJournal.maximumExtent=209715200

##
## Setup for QUADS mode without the full text index.
##
com.bigdata.rdf.sail.truthMaintenance=false
com.bigdata.rdf.store.AbstractTripleStore.quads=true
com.bigdata.rdf.store.AbstractTripleStore.statementIdentifiers=false
com.bigdata.rdf.store.AbstractTripleStore.textIndex=false
com.bigdata.rdf.store.AbstractTripleStore.axiomsClass=com.bigdata.rdf.axioms.NoAxioms

# Bump up the branching factor for the lexicon indices on the default kb.
com.bigdata.namespace.kb.lex.com.bigdata.btree.BTree.branchingFactor=400

# Bump up the branching factor for the statement indices on the default kb.
com.bigdata.namespace.kb.spo.com.bigdata.btree.BTree.branchingFactor=1024

# Uncomment to enable collection of OS level performance counters. When
# collected they will be self-reported through the /counters servlet and
# the workbench "Performance" tab.
#
# com.bigdata.journal.Journal.collectPlatformStatistics=true
2 changes: 1 addition & 1 deletion pnnl.goss.core/core-api.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Export-Package: \
com.northconcepts.exception,\
pnnl.goss.core
Bundle-Version: 10.0.10.${tstamp}
Bundle-Version: 10.0.11
2 changes: 1 addition & 1 deletion pnnl.goss.core/goss-client.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Private-Package: \
pnnl.goss.core.client
Bundle-Version: 2.0.180.${tstamp}
Bundle-Version: 2.0.182
2 changes: 1 addition & 1 deletion pnnl.goss.core/goss-core-commands.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Private-Package: \
pnnl.goss.core.commands
Bundle-Version: 2.0.120.${tstamp}
Bundle-Version: 2.0.121
4 changes: 2 additions & 2 deletions pnnl.goss.core/goss-core-exceptions.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Private-Package: \
pnnl.goss.core.exception
Bundle-Version: 2.1.2.${tstamp}
Bundle-Version: 2.1.3
Export-Package: \
com.northconcepts.exception
com.northconcepts.exception
2 changes: 1 addition & 1 deletion pnnl.goss.core/goss-core-security.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Private-Package: \
Bundle-Activator: pnnl.goss.core.security.impl.Activator
Export-Package: \
pnnl.goss.core.security
Bundle-Version: 9.0.4.${tstamp}
Bundle-Version: 9.0.5
2 changes: 1 addition & 1 deletion pnnl.goss.core/goss-core-server-api.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Export-Package: \
pnnl.goss.core.server
Bundle-Version: 3.0.138.${tstamp}
Bundle-Version: 3.0.139
4 changes: 2 additions & 2 deletions pnnl.goss.core/goss-core-server-registry.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Bundle-Version: 1.0.185.${tstamp}
Bundle-Version: 1.0.186
Private-Package: \
pnnl.goss.server.registry
DynamicImport-Package: *
DynamicImport-Package: *
4 changes: 2 additions & 2 deletions pnnl.goss.core/goss-core-server-web.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ DynamicImport-Package: *
Private-Package: \
pnnl.goss.core.server.web

Bundle-Version: 1.1.50.${tstamp}
Bundle-Version: 1.1.51

# Import webroot folder to path resources/webroot
Include-Resource: resources/webroot=webroot
X-Web-Resource-Version: 1.0
X-Web-Resource: /goss;/resources/webroot
# X-Web-Resource-Default-Page: index.html
Bundle-Activator: pnnl.goss.core.server.web.Activator
Bundle-Activator: pnnl.goss.core.server.web.Activator
7 changes: 4 additions & 3 deletions pnnl.goss.core/goss-core-server.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Private-Package: \
pnnl.goss.core.server.impl
Private-Package: \
pnnl.goss.core.server.impl,\
pnnl.goss.core.server.plugins
DynamicImport-Package: *
#Include-Resource: \
# OSGI-INF/blueprint/blueprint.xml=config/blueprint.xml
Bundle-Version: 2.0.203.${tstamp}
Bundle-Version: 2.0.205
Loading