Reindex when spinning up second master
Make sure reindexing is correctly triggered when
spinning up the secondary master
Change-Id: I821075ccb0d8149ea960ec7943e0caef20fcb492
diff --git a/dual-master/Makefile b/dual-master/Makefile
index d427867..d15fb2c 100644
--- a/dual-master/Makefile
+++ b/dual-master/Makefile
@@ -83,7 +83,8 @@
ParameterKey=GerritLogsVolume,ParameterValue=gerrit-logs-master-2 \
ParameterKey=PeerSubdomain,ParameterValue=$(MASTER1_SUBDOMAIN) \
ParameterKey=LBSubdomain,ParameterValue=$(LB_SUBDOMAIN) \
- ParameterKey=SlaveServiceStackName,ParameterValue=$(SERVICE_SLAVE_STACK_NAME)
+ ParameterKey=SlaveServiceStackName,ParameterValue=$(SERVICE_SLAVE_STACK_NAME) \
+ ParameterKey=ReindexAtSartup,ParameterValue=true
service-slave:
$(AWS_FC_COMMAND) create-stack \
diff --git a/dual-master/cf-service-master.yml b/dual-master/cf-service-master.yml
index 7a24985..2089e8d 100644
--- a/dual-master/cf-service-master.yml
+++ b/dual-master/cf-service-master.yml
@@ -101,6 +101,10 @@
Description: Gerrit logs volume name
Type: String
Default: gerrit-logs-master
+ ReindexAtSartup:
+ Description: Force index reindexing at startup
+ Type: String
+ Default: false
Resources:
Service:
@@ -150,6 +154,8 @@
Value: !Sub 'http://${PeerSubdomain}.${HostedZoneName}:${HTTPGerritLBPort}'
- Name: HOSTED_ZONE_NAME
Value: !Ref HostedZoneName
+ - Name: REINDEX_AT_STARTUP
+ Value: !Ref ReindexAtSartup
MountPoints:
- SourceVolume: !Ref GerritGitVolume
ContainerPath: /var/gerrit/git
diff --git a/gerrit/entrypoint.sh b/gerrit/entrypoint.sh
index c3c1b69..78f0b84 100755
--- a/gerrit/entrypoint.sh
+++ b/gerrit/entrypoint.sh
@@ -6,11 +6,14 @@
git config -f /var/gerrit/etc/gerrit.config container.slave "${CONTAINER_SLAVE:-false}"
if [ $CONTAINER_SLAVE ]; then
+ echo "Slave mode..."
rm -fr /var/gerrit/plugins/replication.jar
java -jar /var/gerrit/bin/gerrit.war reindex --index groups
else
+ echo "Master mode (init phase)..."
java -jar /var/gerrit/bin/gerrit.war init --no-auto-start --batch --install-all-plugins -d /var/gerrit
- if [ ! -f /var/gerrit/index/gerrit_index.config ]; then
+ if [ $REINDEX_AT_STARTUP == "true" ]; then
+ echo "Master mode (reindex phase)..."
java -jar /var/gerrit/bin/gerrit.war reindex -d /var/gerrit
fi
fi
