Skip to content

CLOUD-2261 handling parition by querying api #260

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
rcernich wants to merge 4 commits into
base: master
Choose a base branch
from
Open

CLOUD-2261 handling parition by querying api #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8145f43
[CLOUD-2261] handling parition by querying api
ochaloup Apr 17, 2018
715c36b
Merge branch 'CLOUD-2261-txn-recovery-design' of https://github.com/o…
rcernich Jun 5, 2018
fca2b70
CLOUD-2261 tweaks to pass unit tests
rcernich Jun 6, 2018
c0ad3d3
CLOUD-2261 more tweaks to pass unit tests
rcernich Jun 6, 2018
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.idea/
.project

2 changes: 1 addition & 1 deletion os-amq-launch/added/launch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ if [ "$AMQ_SPLIT" = "true" ]; then
DATA_DIR="${AMQ_HOME}/data"
mkdir -p "${DATA_DIR}"

partitionPV "${DATA_DIR}" "${AMQ_LOCK_TIMEOUT:-30}"
partitionPV "${DATA_DIR}"
else
exec $AMQ_HOME/bin/activemq console
fi
5 changes: 1 addition & 4 deletions os-datavirt/added/openshift-launch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ source ${JBOSS_HOME}/bin/launch/openshift-common.sh

function runServer() {
local instanceDir=$1
local count=$2

export NODE_NAME="${NODE_NAME:-node}-${count}"

source $JBOSS_HOME/bin/launch/configure.sh

Expand All @@ -28,7 +25,7 @@ if [ "${SPLIT_DATA^^}" = "TRUE" ]; then

DATA_DIR="${JBOSS_HOME}/standalone/partitioned_data"

partitionPV "${DATA_DIR}" "${SPLIT_LOCK_TIMEOUT:-30}"
partitionPV "${DATA_DIR}"
else
source $JBOSS_HOME/bin/launch/configure.sh

Expand Down
14 changes: 9 additions & 5 deletions os-eap-migration/added/launch/openshift-migrate-common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ source /opt/partition/partitionPV.sh

function runMigration() {
local instanceDir=$1
local count=$2

export NODE_NAME="${NODE_NAME:-node}-${count}"
cp -f ${STANDALONE_XML_COPY} ${STANDALONE_XML}

source $JBOSS_HOME/bin/launch/configure.sh
Expand All @@ -29,8 +26,15 @@ function runMigration() {
local success=false
local message="Finished, migration pod has been terminated"
${JBOSS_HOME}/bin/readinessProbe.sh
local probeStatus=$?

if [ $probeStatus -eq 0 ] && [ "$(type -t probePodLog)" = 'function' ]; then
# -- checking if server.log is clean from errors (only if function of the particular name exists)
probePodLog # calling function from partitionPV.sh
probeStatus=$?
fi

if [ $? -eq 0 ] ; then
if [ $probeStatus -eq 0 ] ; then
echo "$(date): Server started, checking for transactions"
local startTime=$(date +'%s')
local endTime=$((startTime + ${RECOVERY_TIMEOUT} + 1))
Expand Down Expand Up @@ -66,7 +70,7 @@ function runMigration() {
if [ "${success}" = "true" ] ; then
message="Finished, recovery terminated successfully"
else
message="Finished, Recovery DID NOT complete, check log for details. Recovery will be reattempted."
message="Finished, Recovery DID NOT complete, check log for details. Recovery will be reattempted."
fi
fi

Expand Down
2 changes: 1 addition & 1 deletion os-eap-probes/added/readinessProbe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LOG=/tmp/readiness-log

COUNT=30
SLEEP=5
DEBUG=false
DEBUG=${SCRIPT_DEBUG:-false}
PROBE_IMPL=probe.eap.dmr.EapProbe

if [ $# -gt 0 ] ; then
Expand Down
5 changes: 1 addition & 4 deletions os-eap64-launch/added/openshift-launch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ source ${JBOSS_HOME}/bin/launch/openshift-common.sh

function runServer() {
local instanceDir=$1
local count=$2

export NODE_NAME="${NODE_NAME:-node}-${count}"

source $JBOSS_HOME/bin/launch/configure.sh

Expand All @@ -30,7 +27,7 @@ if [ "${SPLIT_DATA^^}" = "TRUE" ]; then

DATA_DIR="${JBOSS_HOME}/standalone/partitioned_data"

partitionPV "${DATA_DIR}" "${SPLIT_LOCK_TIMEOUT:-30}"
partitionPV "${DATA_DIR}"
else
source $JBOSS_HOME/bin/launch/configure.sh

Expand Down
7 changes: 2 additions & 5 deletions os-eap7-launch/added/openshift-launch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,12 @@ source $JBOSS_HOME/bin/launch/logging.sh
# TERM signal handler
function clean_shutdown() {
log_error "*** JBossAS wrapper process ($$) received TERM signal ***"
$JBOSS_HOME/bin/jboss-cli.sh -c ":shutdown(timeout=60)"
$JBOSS_HOME/bin/jboss-cli.sh -c "shutdown --timeout=60"
wait $!
}

function runServer() {
local instanceDir=$1
local count=$2

export NODE_NAME="${NODE_NAME:-node}-${count}"

source $JBOSS_HOME/bin/launch/configure.sh

Expand Down Expand Up @@ -47,7 +44,7 @@ if [ "${SPLIT_DATA^^}" = "TRUE" ]; then

DATA_DIR="${JBOSS_HOME}/standalone/partitioned_data"

partitionPV "${DATA_DIR}" "${SPLIT_LOCK_TIMEOUT:-30}"
partitionPV "${DATA_DIR}"
else
source $JBOSS_HOME/bin/launch/configure.sh

Expand Down
5 changes: 1 addition & 4 deletions os-jdg-launch/added/openshift-launch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ source ${JBOSS_HOME}/bin/launch/openshift-common.sh

function runServer() {
local instanceDir=$1
local count=$2

export NODE_NAME="${NODE_NAME:-node}-${count}"

source $JBOSS_HOME/bin/launch/configure.sh

Expand All @@ -27,7 +24,7 @@ if [ "${SPLIT_DATA^^}" = "TRUE" ]; then

DATA_DIR="${JBOSS_HOME}/standalone/partitioned_data"

partitionPV "${DATA_DIR}" "${SPLIT_LOCK_TIMEOUT:-30}"
partitionPV "${DATA_DIR}"
else
source $JBOSS_HOME/bin/launch/configure.sh

Expand Down
6 changes: 1 addition & 5 deletions os-jdg7-launch/added/openshift-launch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ source $JBOSS_HOME/bin/launch/logging.sh

function runServer() {
local instanceDir=$1
local count=$2

export NODE_NAME="${NODE_NAME:-node}-${count}"

source $JBOSS_HOME/bin/launch/configure.sh

Expand All @@ -24,14 +21,13 @@ function init_data_dir() {
}

SPLIT_DATA=${SPLIT_DATA:-$DATAGRID_SPLIT}
SPLIT_LOCK_TIMEOUT=${SPLIT_LOCK_TIMEOUT:-$DATAGRID_LOCK_TIMEOUT}

if [ "${SPLIT_DATA^^}" = "TRUE" ]; then
source /opt/partition/partitionPV.sh

DATA_DIR="${JBOSS_HOME}/standalone/partitioned_data"

partitionPV "${DATA_DIR}" "${SPLIT_LOCK_TIMEOUT:-30}"
partitionPV "${DATA_DIR}"
else
source $JBOSS_HOME/bin/launch/configure.sh

Expand Down
Loading