midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-5868 RUN_MonitoredSyncDB ordered by timestamp can have issues (#2030)

This commit is contained in:
Carlos Ruiz 2023-09-30 05:46:57 +02:00 committed by GitHub
parent c994581aef
commit cf140bc75f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
org.adempiere.server-feature/utils.unix/oracle/MonitoredSyncDB.sh
View File

@ -17,10 +17,10 @@
# It is expected that the script 001.fix always end registering calling register_migration_script # It is expected that the script 001.fix always end registering calling register_migration_script
# and also cleaning the Error status from the script that is fixing via update, for example: # and also cleaning the Error status from the script that is fixing via update, for example:
# script 201811121420_IDEMPIERE-2648.001.fix is expected to end with these two lines: # script 201811121420_IDEMPIERE-2648.001.fix is expected to end with these two lines:
# UPDATE AD_MigrationScript SET Status='IP' WHERE Name='201811121420_IDEMPIERE-2648.sql'); # UPDATE AD_MigrationScript SET Status='IP' WHERE Name='201811121420_IDEMPIERE-2648.sql';
# SELECT register_migration_script('201811121420_IDEMPIERE-2648.001.fix') FROM dual; # SELECT register_migration_script('201811121420_IDEMPIERE-2648.001.fix') FROM dual;
# and similar the script 201811121420_IDEMPIERE-2648.002.fix is expected to end with these two lines: # and similar the script 201811121420_IDEMPIERE-2648.002.fix is expected to end with these two lines:
# UPDATE AD_MigrationScript SET Status='IP' WHERE Name='201811121420_IDEMPIERE-2648.001.fix'); # UPDATE AD_MigrationScript SET Status='IP' WHERE Name='201811121420_IDEMPIERE-2648.001.fix';
# SELECT register_migration_script('201811121420_IDEMPIERE-2648.002.fix') FROM dual; # SELECT register_migration_script('201811121420_IDEMPIERE-2648.002.fix') FROM dual;
# and so on # and so on
# 4. If there is an email registered in AD_System.SupportEMail and there is an accessible sendmail program then # 4. If there is an email registered in AD_System.SupportEMail and there is an accessible sendmail program then
@ -62,15 +62,15 @@ if [ "x$4" = "x" ]
then then
DIR_SCRIPTS=$IDEMPIERE_HOME/migration DIR_SCRIPTS=$IDEMPIERE_HOME/migration
else else
if [ "${4#/}" = "${4}" ] if [ "${4:0:1}" = "/" ]
then then
DIR_SCRIPTS="$IDEMPIERE_HOME/$4"
else
DIR_SCRIPTS="$4" DIR_SCRIPTS="$4"
else
DIR_SCRIPTS="$IDEMPIERE_HOME/$4"
fi fi
fi fi
cd "$DIR_SCRIPTS" || exit 1 cd "$DIR_SCRIPTS" || (echo "ERROR: Cannot change to folder $DIR_SCRIPTS"; exit 1)
mkdir $TMPFOLDER/SyncDB_out_$$ mkdir $TMPFOLDER/SyncDB_out_$$
@ -233,7 +233,13 @@ then
while read -r FILE while read -r FILE
do do
SCRIPT=$(find . -name "$FILE" | grep "/$ADEMPIERE_DB_PATH/") SCRIPT=$(find . -name "$FILE" | grep "/$ADEMPIERE_DB_PATH/")
OUTFILE=$TMPFOLDER/SyncDB_out_$$/$(basename "$FILE" .sql).out echo "$SCRIPT" >> $TMPFOLDER/lisPENDINGFOL_$$.txt
done < $TMPFOLDER/lisPENDING_$$.txt
sort -o $TMPFOLDER/lisPENDINGFOL_$$.txt $TMPFOLDER/lisPENDINGFOL_$$.txt
while read -r SCRIPT
do
OUTFILE=$TMPFOLDER/SyncDB_out_$$/$(basename "$SCRIPT" .sql).out
FILE=$(basename "$SCRIPT")
if ! apply_script "$SCRIPT" "$OUTFILE" "$FILE" if ! apply_script "$SCRIPT" "$OUTFILE" "$FILE"
then then
TMPMSGERROR="\n**** ERROR ON FILE $OUTFILE - Please verify ****" TMPMSGERROR="\n**** ERROR ON FILE $OUTFILE - Please verify ****"
@ -250,7 +256,7 @@ then
# Stop processing, problem must be fixed # Stop processing, problem must be fixed
break break
fi fi
done < $TMPFOLDER/lisPENDING_$$.txt done < $TMPFOLDER/lisPENDINGFOL_$$.txt
else else
if [ -s $TMPFOLDER/lisFS_$$.txt ] if [ -s $TMPFOLDER/lisFS_$$.txt ]
then then

0
org.adempiere.server-feature/utils.unix/oracle/SyncDB.sh Normal file → Executable file
View File

24
org.adempiere.server-feature/utils.unix/postgresql/MonitoredSyncDB.sh
View File

@ -17,10 +17,10 @@
# It is expected that the script 001.fix always end registering calling register_migration_script # It is expected that the script 001.fix always end registering calling register_migration_script
# and also cleaning the Error status from the script that is fixing via update, for example: # and also cleaning the Error status from the script that is fixing via update, for example:
# script 201811121420_IDEMPIERE-2648.001.fix is expected to end with these two lines: # script 201811121420_IDEMPIERE-2648.001.fix is expected to end with these two lines:
# UPDATE AD_MigrationScript SET Status='IP' WHERE Name='201811121420_IDEMPIERE-2648.sql'); # UPDATE AD_MigrationScript SET Status='IP' WHERE Name='201811121420_IDEMPIERE-2648.sql';
# SELECT register_migration_script('201811121420_IDEMPIERE-2648.001.fix') FROM dual; # SELECT register_migration_script('201811121420_IDEMPIERE-2648.001.fix') FROM dual;
# and similar the script 201811121420_IDEMPIERE-2648.002.fix is expected to end with these two lines: # and similar the script 201811121420_IDEMPIERE-2648.002.fix is expected to end with these two lines:
# UPDATE AD_MigrationScript SET Status='IP' WHERE Name='201811121420_IDEMPIERE-2648.001.fix'); # UPDATE AD_MigrationScript SET Status='IP' WHERE Name='201811121420_IDEMPIERE-2648.001.fix';
# SELECT register_migration_script('201811121420_IDEMPIERE-2648.002.fix') FROM dual; # SELECT register_migration_script('201811121420_IDEMPIERE-2648.002.fix') FROM dual;
# and so on # and so on
# 4. If there is an email registered in AD_System.SupportEMail and there is an accessible sendmail program then # 4. If there is an email registered in AD_System.SupportEMail and there is an accessible sendmail program then
@ -74,15 +74,15 @@ if [ "x$4" = "x" ]
then then
DIR_SCRIPTS=$IDEMPIERE_HOME/migration DIR_SCRIPTS=$IDEMPIERE_HOME/migration
else else
if [ "${4#/}" = "${4}" ] if [ "${4:0:1}" = "/" ]
then then
DIR_SCRIPTS="$IDEMPIERE_HOME/$4"
else
DIR_SCRIPTS="$4" DIR_SCRIPTS="$4"
else
DIR_SCRIPTS="$IDEMPIERE_HOME/$4"
fi fi
fi fi
cd "$DIR_SCRIPTS" || exit 1 cd "$DIR_SCRIPTS" || (echo "ERROR: Cannot change to folder $DIR_SCRIPTS"; exit 1)
mkdir $TMPFOLDER/SyncDB_out_$$ mkdir $TMPFOLDER/SyncDB_out_$$
@ -218,7 +218,7 @@ do
fi fi
done < $TMPFOLDER/lisERR_$$.txt done < $TMPFOLDER/lisERR_$$.txt
# Create list of files already applied - registered in ad_migrationscript table # Create list of files already applied - registered in AD_MigrationScript table
echo "select name from ad_migrationscript" | $SILENTCMD | sed -e 's:^ ::' | grep -v '^$' | sort > $TMPFOLDER/lisDB_$$.txt echo "select name from ad_migrationscript" | $SILENTCMD | sed -e 's:^ ::' | grep -v '^$' | sort > $TMPFOLDER/lisDB_$$.txt
# Create list of files in the migration folder # Create list of files in the migration folder
@ -232,7 +232,13 @@ then
while read -r FILE while read -r FILE
do do
SCRIPT=$(find . -name "$FILE" | grep "/$ADEMPIERE_DB_PATH/") SCRIPT=$(find . -name "$FILE" | grep "/$ADEMPIERE_DB_PATH/")
OUTFILE=$TMPFOLDER/SyncDB_out_$$/$(basename "$FILE" .sql).out echo "$SCRIPT" >> $TMPFOLDER/lisPENDINGFOL_$$.txt
done < $TMPFOLDER/lisPENDING_$$.txt
sort -o $TMPFOLDER/lisPENDINGFOL_$$.txt $TMPFOLDER/lisPENDINGFOL_$$.txt
while read -r SCRIPT
do
OUTFILE=$TMPFOLDER/SyncDB_out_$$/$(basename "$SCRIPT" .sql).out
FILE=$(basename "$SCRIPT")
if ! apply_script "$SCRIPT" "$OUTFILE" "$FILE" if ! apply_script "$SCRIPT" "$OUTFILE" "$FILE"
then then
TMPMSGERROR="\n**** ERROR ON FILE $OUTFILE - Please verify ****" TMPMSGERROR="\n**** ERROR ON FILE $OUTFILE - Please verify ****"
@ -249,7 +255,7 @@ then
# Stop processing, problem must be fixed # Stop processing, problem must be fixed
break break
fi fi
done < $TMPFOLDER/lisPENDING_$$.txt done < $TMPFOLDER/lisPENDINGFOL_$$.txt
else else
if [ -s $TMPFOLDER/lisFS_$$.txt ] if [ -s $TMPFOLDER/lisFS_$$.txt ]
then then

2
org.adempiere.server-feature/utils.unix/postgresql/SyncDB.sh Normal file → Executable file
View File

@ -29,7 +29,7 @@ export PGPASSWORD
TMPFOLDER=/tmp TMPFOLDER=/tmp
ADEMPIERE_DB_USER=$1 ADEMPIERE_DB_USER=$1
ADEMPIERE_DB_PATH=$3 ADEMPIERE_DB_PATH=$3
CMD="psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $ADEMPIERE_DB_USER -b" CMD="psql -b -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $ADEMPIERE_DB_USER -b"
SILENTCMD="$CMD -q -t" SILENTCMD="$CMD -q -t"
ERROR_STRINGS="^(ERROR:|FEHLER:|FATAL:|ERRO:)" ERROR_STRINGS="^(ERROR:|FEHLER:|FATAL:|ERRO:)"
DIR_POST=$IDEMPIERE_HOME/migration DIR_POST=$IDEMPIERE_HOME/migration