Skip to content

Commit ae115fd

Browse files
fixing everything
pull request updates
1 parent c593125 commit ae115fd

File tree

2 files changed

+60
-14
lines changed

2 files changed

+60
-14
lines changed

conf/openshift/openshift.json

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,18 @@
124124
}
125125
},
126126
{
127-
"kind": "DeploymentConfig",
128-
"apiVersion": "v1",
127+
"kind": "StatefulSet",
128+
"apiVersion": "apps/v1beta1",
129129
"metadata": {
130130
"name": "dataverse-glassfish",
131131
"annotations": {
132-
"template.alpha.openshift.io/wait-for-ready": "true"
132+
"template.alpha.openshift.io/wait-for-ready": "true",
133+
"alpha.image.policy.openshift.io/resolve-names": "*"
133134
}
134135
},
135136
"spec": {
137+
"serviceName" : "dataverse-glassfish",
138+
"replicas": 1,
136139
"template": {
137140
"metadata": {
138141
"labels": {
@@ -143,14 +146,26 @@
143146
"containers": [
144147
{
145148
"name": "dataverse-plus-glassfish",
146-
"image": "dataverse-plus-glassfish",
149+
"image": "iqss/dataverse-glassfish:latest",
147150
"ports": [
148151
{
149152
"containerPort": 8080,
150153
"protocol": "TCP"
151154
}
152155
],
156+
"resources": {"limits": {"memory": "3072Mi"
157+
}
158+
159+
},
153160
"env": [
161+
162+
{ "name": "MY_POD_NAME",
163+
"valueFrom": {
164+
"fieldRef": {
165+
"fieldPath": "metadata.name"
166+
}
167+
}
168+
},
154169
{
155170
"name": "POSTGRES_SERVER",
156171
"value": "dataverse-postgresql-0"
@@ -184,7 +199,7 @@
184199
"value": "dvndb"
185200
}
186201
],
187-
"imagePullPolicy": "IfNotPresent",
202+
"imagePullPolicy": "Always",
188203
"securityContext": {
189204
"capabilities": {},
190205
"privileged": false
@@ -200,7 +215,9 @@
200215
"intervalSeconds": 1,
201216
"timeoutSeconds": 300
202217
},
203-
"resources": {}
218+
"resources": {"limits": {
219+
"memory": "512Mi"
220+
}}
204221
},
205222
"triggers": [
206223
{
@@ -220,9 +237,11 @@
220237
"type": "ConfigChange"
221238
}
222239
],
223-
"replicas": 1,
224240
"selector": {
225-
"name": "iqss-dataverse-glassfish"
241+
"name": "iqss-dataverse-glassfish",
242+
"matchLabels" : {
243+
"name": "iqss-dataverse-glassfish"
244+
}
226245
}
227246
}
228247
},
@@ -252,6 +271,7 @@
252271
"command": [
253272
"sh", "-c", "echo 'Setting up Postgres Master/Slave replication...'; [[ `hostname` =~ -([0-9]+)$ ]] || exit 1; ordinal=${BASH_REMATCH[1]}; if [[ $ordinal -eq 0 ]]; then run-postgresql-master; else run-postgresql-slave; fi;"
254273
],
274+
255275
"ports": [
256276
{
257277
"containerPort": 5432,
@@ -306,7 +326,7 @@
306326
"memory": "256Mi"
307327
}
308328
},
309-
"imagePullPolicy": "IfNotPresent",
329+
"imagePullPolicy": "Always",
310330
"securityContext": {
311331
"capabilities": {},
312332
"privileged": false
@@ -371,7 +391,7 @@
371391
"containers": [
372392
{
373393
"name": "iqss-dataverse-solr",
374-
"image": "iqss-dataverse-solr",
394+
"image": "iqss-dataverse-solr:latest",
375395
"ports": [
376396
{
377397
"containerPort": 8983,
@@ -380,10 +400,10 @@
380400
],
381401
"resources": {
382402
"limits": {
383-
"memory": "256Mi"
403+
"memory": "1024Mi"
384404
}
385405
},
386-
"imagePullPolicy": "IfNotPresent",
406+
"imagePullPolicy": "Always",
387407
"securityContext": {
388408
"capabilities": {},
389409
"privileged": false

scripts/installer/glassfish-setup.sh

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,20 @@ fi
191191

192192
###
193193
# Set up the data source for the timers
194-
./asadmin $ASADMIN_OPTS set configs.config.server-config.ejb-container.ejb-timer-service.timer-datasource=jdbc/VDCNetDS
194+
195+
if [ -z "$MY_POD_NAME" ]
196+
then
197+
./asadmin $ASADMIN_OPTS set configs.config.server-config.ejb-container.ejb-timer-service.timer-datasource=jdbc/VDCNetDS
198+
199+
else
200+
echo $MY_POD_NAME
201+
if [ $MY_POD_NAME == "dataverse-glassfish-0" ]
202+
then
203+
./asadmin $ASADMIN_OPTS set configs.config.server-config.ejb-container.ejb-timer-service.timer-datasource=jdbc/VDCNetDS
204+
echo "Only I Run The Jobs"
205+
fi
206+
fi
207+
195208

196209
###
197210
# Add the necessary JVM options:
@@ -216,7 +229,20 @@ fi
216229
./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddoi.username=apitest"
217230
./asadmin $ASADMIN_OPTS create-jvm-options "\-Ddoi.baseurlstring=https\://ezid.cdlib.org"
218231
# "I am the timer server" option:
219-
./asadmin $ASADMIN_OPTS create-jvm-options "-Ddataverse.timerServer=true"
232+
233+
if [ -z "$MY_POD_NAME" ]
234+
then
235+
./asadmin $ASADMIN_OPTS create-jvm-options "-Ddataverse.timerServer=true"
236+
237+
else
238+
if [ $MY_POD_NAME == "dataverse-glassfish-0" ]
239+
then
240+
./asadmin $ASADMIN_OPTS create-jvm-options "-Ddataverse.timerServer=true"
241+
242+
fi
243+
fi
244+
245+
220246

221247
# enable comet support
222248
./asadmin $ASADMIN_OPTS set server-config.network-config.protocols.protocol.http-listener-1.http.comet-support-enabled="true"

0 commit comments

Comments
 (0)