#!/bin/bash #============================================================================== # Copyright and license info is available in the LICENSE file included with # the Server Deployment Package (SDP), and also available online: # https://swarm.workshop.perforce.com/projects/perforce-software-sdp/view/main/LICENSE #------------------------------------------------------------------------------ set -u # Common functions used in all backup scripts. check_vars () { if [[ -z "$SDP_INSTANCE" || -z "$P4HOME" || -z "$P4PORT" || -z "$P4ROOT" || -z "$P4JOURNAL" || -z "$P4BIN" || -z "$P4DBIN" || -z "$P4TICKETS" || -z "$KEEPCKPS" || -z "$KEEPLOGS" || -z "$CHECKPOINTS" || -z "$LOGS" || -z "$OSUSER" ]]; then echo "Use p4master_run when calling this script." echo "Required external variable not set. Abort!" exit 1 fi } set_vars () { RC=/etc/init.d/p4d_${SDP_INSTANCE}_init [[ -f "$RC" ]] || RC=/p4/$SDP_INSTANCE/bin/p4d_${SDP_INSTANCE}_init LOGFILE=$LOGS/checkpoint.log OFFLINE_DB=${P4HOME}/offline_db SAVEDIR=${P4ROOT}/save EDGESERVER=0 $P4BIN -u $P4USER -p $P4PORT login < /p4/common/bin/adminpass > /dev/null $P4BIN -u $P4USER -p $P4PORT server -o $SERVERID | grep ^Services | grep "edge-server" > /dev/null if [[ `echo $?` -eq 0 ]]; then EDGESERVER=1 fi } # check if user is running as required OS user check_uid () { user=`id -un` if [[ ${user} != ${OSUSER} ]]; then die "Must be run by user: ${OSUSER}. Abort!" fi } log () { echo -n `date` 2>&1 >> "$LOGFILE" echo " $0: $@" 2>&1 >> "$LOGFILE" } # Decide depending on our mail utility, how to specify sender (if we need to) get_mail_sender_opt () { local mail_sender_opt="" if [[ ! -z "$MAILFROM" ]]; then # Default for CentOS/RHEL, but allow GNU Mailutils alternative flag instead mail_sender_opt="-S from=$MAILFROM" local mail_ver=`$SDPMAIL -V` [[ "$mail_ver" =~ "GNU Mailutils" ]] && mail_sender_opt="-aFrom:$MAILFROM" fi echo "$mail_sender_opt" } mail_log_file () { local subject=$1 local mail_sender_opt=$(get_mail_sender_opt) $SDPMAIL -s "$subject" $mail_sender_opt $MAILTO < "$LOGFILE" } die () { # send mail and exit # mail the error (with more helpful subject line than cron) log "ERROR!!! - $HOSTNAME $P4SERVER $0: $@" mail_log_file "ERROR!!! - $HOSTNAME $P4SERVER $0: $@" # if running from terminal, also send to stderr tty >/dev/null if [[ $? -eq 0 ]]; then echo "$@" >&2 fi exit 1 } checkdir () { local dir=$1 [[ -w $dir ]] && return die "$dir is not writable. Abort!" } check_dirs () { # Check that key dirs are writable dirs_ok=true for dir in $OFFLINE_DB $CHECKPOINTS $LOGS; do checkdir $dir # aborts on failure. done } check_disk_space () { # Add the results of df -h or df -m to the log file. log "Checking disk space..." $P4BIN diskspace >> "$LOGFILE" 2>&1 } check_journalnum () { re='^[0-9]+$' if ! [[ $JOURNALNUM =~ $re ]] ; then die "Journal number must be numeric." fi } get_journalnum () { # get the current journal and checkpoint serial numbers. JOURNALNUM=`$P4BIN -u $P4USER -p $P4PORT counter journal 2>> $LOGFILE` || \ die "Cannot get the checkpoint number. Abort!" # If we are on an edge server, the journal has already rotated, so we have to decrement the value # so that we replay the correct journal file and create the correct checkpoint number on the # edge server. check_journalnum if [[ $EDGESERVER -eq 1 ]]; then JOURNALNUM=$(($JOURNALNUM - 1)) fi CHECKPOINTNUM=$(($JOURNALNUM + 1)) } get_offline_journal_num () { # Get the journal number of the offline database if [[ ! -f $OFFLINE_DB/offline_db_usable.txt ]]; then die "Offline database not in a usable state. Check the backup process." fi if [[ ! -f $OFFLINE_DB/db.counters ]]; then die "Offline database not found. Consider creating it with live_checkpoint.sh. Be aware that it locks the live system and can take a long time! Abort!" log "Offline database not found." fi OFFLINEJNLNUM=`$P4DBIN -r $OFFLINE_DB -jd - db.counters | grep '@journal@' | cut -d "@" -f 8 2>> $LOGFILE` || \ die "Cannot get the offline journal number. Abort!" check_journalnum log "Offline journal number is: $OFFLINEJNLNUM" if [[ $OFFLINEJNLNUM -gt $JOURNALNUM ]]; then die "$JOURNALNUM already replayed into the offline database." fi } replay_journals_to_offline_db () { log "Replay any unreplayed journals to the offline database" for (( j=$OFFLINEJNLNUM; $j <= (($JOURNALNUM-1)); j++ )); do log "Replay journal ${P4SERVER}.jnl.${OFFLINEJNLNUM} to offline db." # curly braces are necessary to capture the output of 'time' { time $P4DBIN -r $OFFLINE_DB -jr -f ${CHECKPOINTS}/${P4SERVER}.jnl.${j}; } \ >> "$LOGFILE" 2>&1 || { die "Offline journal replay failed. Abort!"; } done } remove_old_checkpoints_and_journals () { if [[ $KEEPCKPS -eq 0 ]]; then log "Skipping cleanup of old checkpoints because KEEPCKPS is set to 0." elif [[ $(($JOURNALNUM-$KEEPCKPS)) -gt 7 ]]; then log "Deleting obsolete checkpoints and journals. Keeping latest $KEEPCKPS per KEEPCKPS setting in p4_vars." STARTNUM=$(($JOURNALNUM-$KEEPCKPS-100)) if [[ $STARTNUM -lt 0 ]]; then STARTNUM=0 fi # Remove selected checkpoint and journal files based on # journal counter, regardless of whether compressed or not. for (( j=$STARTNUM; $j <= (($JOURNALNUM-$KEEPCKPS)); j++ )); do I_CKPFILE=${CHECKPOINTS}/${P4SERVER}.ckp.$j I_JNLFILE=${CHECKPOINTS}/${P4SERVER}.jnl.$j if [[ -f "$I_CKPFILE" ]]; then log "rm -f $I_CKPFILE" rm -f "$I_CKPFILE" fi if [[ -f "${I_CKPFILE}.md5" ]]; then log "rm -f ${I_CKPFILE}.md5" rm -f "${I_CKPFILE}.md5" fi if [[ -f "$I_JNLFILE" ]]; then log "rm -f $I_JNLFILE" rm -f "$I_JNLFILE" fi I_CKPFILE=${CHECKPOINTS}/${P4SERVER}.ckp.$j.gz I_JNLFILE=${CHECKPOINTS}/${P4SERVER}.jnl.$j.gz if [[ -f "$I_CKPFILE" ]]; then log "rm -f $I_CKPFILE" rm -f "$I_CKPFILE" fi if [[ -f "${I_CKPFILE}.md5" ]]; then log "rm -f ${I_CKPFILE}.md5" rm -f "${I_CKPFILE}.md5" fi if [[ -f "$I_JNLFILE" ]]; then log "rm -f $I_JNLFILE" rm -f "$I_JNLFILE" fi done else log "No old checkpoints and journals need to be deleted." fi } stop_p4d () { log "Shutting down the p4 server" $RC stop >> "$LOGFILE" 2>&1 COUNTER=$( ps -ef | grep -i p4d_$P4INSTANCE | grep -v grep | wc -l ) declare -i WAITCOUNT=0 while [[ $COUNTER != "0" ]]; do sleep 5 COUNTER=$( ps -ef | grep -i p4d_$P4INSTANCE | grep -v grep | wc -l ) WAITCOUNT=$(( $WAITCOUNT + 1 )) if (( $WAITCOUNT > 120 )); then ps -ef | grep -i p4d_$P4INSTANCE | awk '{print $2}' | xargs kill > /dev/null 2>&1 fi done log "p4 stop finished -- p4 should be down now." } start_p4d () { log "Starting the p4 server" $RC start >> "$LOGFILE" 2>&1 sleep 3 # Give it a few seconds to start up # Confirm that it started - success below means it did if $P4BIN -u $P4USER -p $P4PORT info >/dev/null 2>&1 ; then log "Server restarted successfully - p4 should be back up now." else log "Error: Server does not appear to have started." fi } truncate_journal () { [[ -f ${CHECKPOINTS}/${P4SERVER}.ckp.${CHECKPOINTNUM}.gz ]] && die "Checkpoint ${CHECKPOINTS}/${P4SERVER}.ckp.${CHECKPOINTNUM}.gz already exists, check the backup process." if [[ $EDGESERVER -eq 0 ]]; then [[ -f ${CHECKPOINTS}/${P4SERVER}.jnl.${JOURNALNUM} ]] && die "Journal ${CHECKPOINTS}/${P4SERVER}.jnl.${JOURNALNUM} already exists, check the backup process." log "Truncating journal..." # 'p4d -jj' does a copy-then-delete, instead of a simple mv. # during 'p4d -jj' the perforce server will hang the responses to clients. # curly braces are necessary to capture the output of 'time' { time $P4DBIN -r $P4ROOT -J $P4JOURNAL -jj ${CHECKPOINTS}/${P4SERVER}; } \ >> "$LOGFILE" 2>&1 || \ { start_p4d; die "Journal rotation failed. Abort!"; } fi } replay_journal_to_offline_db () { log "Replay journal to offline db." # curly braces are necessary to capture the output of 'time' { time $P4DBIN -r $OFFLINE_DB -jr -f ${CHECKPOINTS}/${P4SERVER}.jnl.${JOURNALNUM}; } \ >> "$LOGFILE" 2>&1 || \ { die "Journal replay failed. Abort!"; } } replay_active_journal_to_offline_db () { log "Replay active journal to offline db." # curly braces are necessary to capture the output of 'time' { time $P4DBIN -r $OFFLINE_DB -jr -f ${P4JOURNAL}; } \ >> "$LOGFILE" 2>&1 || \ { die "Active Journal replay failed. Abort!"; } } dump_checkpoint () { log "Dump out new checkpoint from db files in $ROOTDIR." # curly braces are necessary to capture the output of 'time' { time $P4DBIN -r $ROOTDIR -jd -z ${CHECKPOINTS}/${P4SERVER}.ckp.${CHECKPOINTNUM}.gz; } \ >> "$LOGFILE" 2>&1 || { die "New checkpoint dump failed!"; } } recreate_offline_db_files () { log "Recreate offline db files for quick recovery process." rm -f ${OFFLINE_DB}/offline_db_usable.txt rm -f ${OFFLINE_DB}/db.* >> "$LOGFILE" # curly braces are necessary to capture the output of 'time' { time $P4DBIN -r $OFFLINE_DB -jr -z ${CHECKPOINTS}/${P4SERVER}.ckp.${CHECKPOINTNUM}.gz; } \ >> "$LOGFILE" 2>&1 || { die "Restore of checkpoint to $OFFLINE_DB failed!"; } echo "Offline db file restored successfully." > ${OFFLINE_DB}/offline_db_usable.txt } recreate_weekly_offline_db_files () { log "Recreate offline db files for quick recovery process." rm -f ${OFFLINE_DB}/offline_db_usable.txt rm -f ${OFFLINE_DB}/db.* >> "$LOGFILE" LASTCKP=`ls -t ${CHECKPOINTS}/${P4SERVER}.ckp.*.gz | head -1` # curly braces are necessary to capture the output of 'time' { time $P4DBIN -r $OFFLINE_DB -jr -z ${LASTCKP}; } \ >> "$LOGFILE" 2>&1 || { die "Restore of checkpoint to $OFFLINE_DB failed!"; } echo "Offline db file restored successfully." > ${OFFLINE_DB}/offline_db_usable.txt } # At the start of each run for live_checkpoint.sh, daily_backup.sh, and # weekly_backup.sh, before *any* logging activity occurs, rotate the logs # from the most recent prior run, always named "checkpoint.log" or "log". rotate_last_run_logs () { # Rotate prior checkpoint.log [[ -f "$LOGFILE" ]] && mv -f "$LOGFILE" "$LOGFILE.$JOURNALNUM" # Rotate prior server log. if [[ -f "$LOGS/log" ]]; then mv -f "$LOGS/log" "$LOGS/log.$JOURNALNUM" >> $LOGFILE 2>&1 cd "$LOGS" rm -f "log.$JOURNALNUM.gz" gzip "log.$JOURNALNUM" >> $LOGFILE 2>&1 cd - > /dev/null fi # Rotate prior broker log. if [[ -f "$LOGS/p4broker.log" ]]; then mv -f "$LOGS/p4broker.log" "$LOGS/p4broker.log.$JOURNALNUM" >> $LOGFILE 2>&1 cd "$LOGS" rm -f "p4broker.log.$JOURNALNUM.gz" gzip "p4broker.log.$JOURNALNUM" >> $LOGFILE 2>&1 cd - > /dev/null fi # Rotate prior audit log. if [[ -f "$LOGS/audit.log" ]]; then mv -f "$LOGS/audit.log" "$LOGS/audit.log.$JOURNALNUM" >> $LOGFILE 2>&1 cd "$LOGS" rm -f "audit.log.$JOURNALNUM.gz" gzip "audit.log.$JOURNALNUM" >> $LOGFILE 2>&1 cd - > /dev/null fi # Rotate prior sync_replica log. if [[ -f "$LOGS/sync_replica.log" ]]; then mv -f "$LOGS/sync_replica.log" "$LOGS/sync_replica.log.$JOURNALNUM" >> $LOGFILE 2>&1 cd "$LOGS" rm -f "sync_replica.log.$JOURNALNUM.gz" gzip "sync_replica.log.$JOURNALNUM" >> $LOGFILE 2>&1 cd - > /dev/null fi } remove_old_logs () { # Remove old Checkpoint Logs # Use KEEPCKPS rather than KEEPLOGS, so we keep the same number # of checkpoint logs as we keep checkpoints. # Avoid automatically removing #'s 1-7 in any case. STARTNUM=$(($JOURNALNUM-$KEEPLOGS-100)) if [[ $STARTNUM -lt 0 ]]; then STARTNUM=0 fi if [[ $KEEPCKPS -eq 0 ]]; then log "Skipping cleanup of old checkpoint logs because KEEPCKPS is set to 0." elif [[ $(($JOURNALNUM-$KEEPCKPS)) -gt 7 ]]; then log "Deleting old checkpoint logs. Keeping latest $KEEPCKPS, per KEEPCKPS setting in p4_vars." for (( j=$STARTNUM; $j <= (($JOURNALNUM-$KEEPCKPS)); j++ )); do I_LOGFILE="$LOGS/checkpoint.log.$j" if [[ -f "$I_LOGFILE" ]]; then log "rm -f $I_LOGFILE" rm -f "$I_LOGFILE" fi done else log "No old checkpoint logs need to be deleted." fi if [[ $KEEPLOGS -eq 0 ]]; then log "Skipping cleanup of old server logs because KEEPLOGS is set to 0." elif [[ $(($JOURNALNUM-$KEEPLOGS)) -gt 7 ]]; then log "Deleting old server logs. Keeping latest $KEEPLOGS, per KEEPLOGS setting in p4_vars." for (( j=$STARTNUM; $j <= (($JOURNALNUM-$KEEPLOGS)); j++ )); do I_LOGFILE="$LOGS/log.$j" if [[ -f "$I_LOGFILE" ]]; then log "rm -f $I_LOGFILE" rm -f "$I_LOGFILE" fi I_LOGFILE="$LOGS/log.$j.gz" if [[ -f "$I_LOGFILE" ]]; then log "rm -f $I_LOGFILE" rm -f "$I_LOGFILE" fi done for (( j=$STARTNUM; $j <= (($JOURNALNUM-$KEEPLOGS)); j++ )); do I_LOGFILE="$LOGS/p4broker.log.$j" if [[ -f "$I_LOGFILE" ]]; then log "rm -f $I_LOGFILE" rm -f "$I_LOGFILE" fi I_LOGFILE="$LOGS/p4broker.log.$j.gz" if [[ -f "$I_LOGFILE" ]]; then log "rm -f $I_LOGFILE" rm -f "$I_LOGFILE" fi done for (( j=$STARTNUM; $j <= (($JOURNALNUM-$KEEPLOGS)); j++ )); do I_LOGFILE="$LOGS/audit.log.$j" if [[ -f "$I_LOGFILE" ]]; then log "rm -f $I_LOGFILE" rm -f "$I_LOGFILE" fi I_LOGFILE="$LOGS/audit.log.$j.gz" if [[ -f "$I_LOGFILE" ]]; then log "rm -f $I_LOGFILE" rm -f "$I_LOGFILE" fi done for (( j=$STARTNUM; $j <= (($JOURNALNUM-$KEEPLOGS)); j++ )); do I_LOGFILE="$LOGS/sync_replica.log.$j" if [[ -f "$I_LOGFILE" ]]; then log "rm -f $I_LOGFILE" rm -f "$I_LOGFILE" fi I_LOGFILE="$LOGS/sync_replica.log.$j.gz" if [[ -f "$I_LOGFILE" ]]; then log "rm -f $I_LOGFILE" rm -f "$I_LOGFILE" fi done else log "No old server logs need to be deleted." fi } set_counter() { $P4BIN -u $P4USER -p $P4PORT login < /p4/common/bin/adminpass > /dev/null $P4BIN -u $P4USER -p $P4PORT counter lastSDPCheckpoint "$(date +'%s (%y/%m/%d %H:%M:%S %z %Z)')" > /dev/null } ckp_running() { if [[ -f ${CHECKPOINTS}/ckp_running.txt ]]; then die "Last checkpoint not complete. Check the backup process." fi echo "Checkpoint running." > ${CHECKPOINTS}/ckp_running.txt } ckp_complete() { rm -f ${CHECKPOINTS}/ckp_running.txt }
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#147 | 30654 | C. Thomas Tyler |
Revised logic replaying checkpoints to select the most recent checkpoint regardless of whether it is parallel or not. This logic now applies consistently across scripts (even some not in this changelist that call functions in backup_functions.sh), such as sync_replica.sh, sync_replica.sh, load_checkpoint.sh, recover_edge.sh, etc. The edge_dump.sh script now creates parallel checkpoints if parallel checkpoints are configured. The load_checkpoint.sh now reliably detects the most recent checkpoint when '-latest' is used reliably, serial or parallel. This script now also finds checkpoints for a standby of an edge. Also fixed bug cleaning up old *.OK files from earlier parallel checkpoints. The recover_edge.sh script similarly detects the latest checkpoint correctly, serial or parallel. This chagne was tested with a new regression test suite that operates in a Battle School Lab environment, allowing for more sophisticated testing of sequences of operations. #review-30655 |
||
#146 | 30372 | Will Kreitzmann | as per Tom request remove echos | ||
#145 | 30370 | Will Kreitzmann | (SDP-1065) SNS fix's though I'd like to mow the lawn a bit more on this | ||
#144 | 30305 | C. Thomas Tyler |
Refined JDTmpDir implementation to handle case of empty data sets consistently. #review-30306 @robert_cowham |
||
#143 | 30269 | Robert Cowham | Fix typo in variable usage | ||
#142 | 30267 | Robert Cowham |
Copy files to be dumped via p4d -jd to tmp dir first to avoid locks on P4ROOT (or offline_db) SDP-1087 |
||
#141 | 30210 | C. Thomas Tyler |
Adjusted set_counter() so the checkpoint counter is set consistently on any p4d server (commit, edge, standby, filtered forwarding replica, etc.). Also enhanced auditability of counter setting. #review-30211 |
||
#140 | 30175 | C. Thomas Tyler |
request_replica_checkpoint.sh can request parallel checkpoints. Added safety check to avoid running 'p4 admin checkpoint' command against the commit. #review-30176 |
||
#139 | 30072 | C. Thomas Tyler |
Added '-v track=-1' to all 'p4d -jd' commands to prevent cron.d from sending bogus emails containing only tracking data if 'track' (performance tracking) was enabled. #review-30073 @robert_cowham |
||
#138 | 30071 | lbarbier |
Fix FROM email function While previous implementation with -Sfrom= do make emails appear to be sent from the $MAILFROM, it's still sent as <user>@<fqdn> of the p4 server. Exchange will see this in the headers and consider it's sent from an untrusted place/domain. |
||
#137 | 29992 | C. Thomas Tyler |
p4verify.sh: Added support for handling the 'trait' depot (new in 2023.2). Refactored get_old_log_timestamp() function, moving it from backup_functions.sh into new log_functions.sh file. #review-29993 |
||
#136 | 29911 | Robert Cowham |
Changed format of data in log() function in backup_functions.sh to something easier to parse mechanically. We lose the time zone in the log with this format, but the inconsistent format of the timezone was part of the problem with parsing. Note this is parsed by "date -d" so original change to fix didn't work! #review-29800 @tom_tyler |
||
#135 | 29898 | Will Kreitzmann |
addition log files. p4p.log rotate_proxy.log p4pcm.log |
||
#134 | 29871 | C. Thomas Tyler |
Added support for s-nail email utility. Thanks for the contribution, Laurent! :) |
||
#133 | 29863 | C. Thomas Tyler | Fixed quoting issue affecting simulated email mode. | ||
#132 | 29799 | C. Thomas Tyler |
Changed format of data in log() function in backup_functions.sh to something easier to parse mechanically. We lose the time zone in the log with this format, but the inconsistent format of the timezone was part of the problem with parsing. #review-29800 @robert_cowham |
||
#131 | 29795 | C. Thomas Tyler |
Fixed bug where proxy_rotate.sh and broker_rotate.sh called check_dirs() looking for p4d directories, reporting errors. Fixed by adding optional ServerType parameter: 1 (default) - check for dirs for a p4d server 2 - check for dirs for a standalone proxy or broker Also addressed style issues to achieve compliance with ShellCheck v0.9.0. #review @robert_cowham @karl_wirth |
||
#130 | 29595 | C. Thomas Tyler |
Fixed so, if 'mail' program is not in PATH, a nice 'Simulated email' echo is displayed rather than an ugly error message. |
||
#129 | 29592 | C. Thomas Tyler |
Added support for P4D r23.1+ multi-file per-table parallel checkpoints. If DO_PARALLEL_CHECKPOINTS=4 (for example) is set in the instance vars file, live checkpoints are created with 'p4d -jcpm' and daily checkpoints are created with 'p4d -jdpm'. Replays are done with 'p4d -jrp' (same as in P4D r22.2; there is no '-jrpm'). With this change, live_checkpoint.sh and daily_checkpoint.sh take advantage of parallel checkpoint features. To Do: * Add doc coverage in SDP Guide for the full lifecycle of parallel checkpoints, including updates to recovery procedures. * Other checkpoint-handling scripts: - load_checkpoint.sh - mkrep.sh - edge_dump.sh - recover_edge.sh - sync_replica.sh #review-29593 @brent_schiestl |
||
#128 | 29590 | C. Thomas Tyler |
Another refinement of sync_replica.sh logic to handle all intended use cases: * HA of commit server, with and without NFS sharing (SHAREDDATA). * HA of edge server, with and without NFS sharing (SHAREDDATA). When NFS sharing, the rsync from the target server is disabled, as before. When rsycing for full replicas (not NFS-sharing, metadata-only replicas), the sync_replica.sh script now always rsyncs from a checkpoints directory based on the journalPrefix of the P4TARGET server. This is correct for all scenarios. If that cannot be determined, the script now does a die() call to avoid rsyncing to a possibly incorrect path. When rebuilding the local offline_db, the checkpoints directory based on the journalPrefix of the P4TARGET server is always used. This directory should exist, whether due to rsync from the target, or NFS-sharing. Logic to remove old checkpoints and journals now only cleans in folders written to by the local replica, to avoid removing files on an NFS-shared upstream server. Auditability of checkpoint operations in backup_functions.sh is improved. #review-29591 |
||
#127 | 29578 | C. Thomas Tyler |
Fixed issue with log rotation login on some platforms. #review-29579 @Domenic |
||
#126 | 29576 | C. Thomas Tyler |
Enhanced sync_replica.sh to support operation on a 'ham' type replica (HA, Metadata-only). A 'ham' type replica replicates only metadata, and shares the /hxdepots volume (via NFS) with its target server. In this configuration, the SHAREDDATA=TRUE value is set, and this corresponds to a p4d configuration setting for the replica of lbr.replication=shared. In this configuration, the journalPrefix value of the replica server will differ from that of its target server. For example, the commit server will may have the First Form jour the journalPrefix, while an HA of the commit will have the Second Form. See 'The journalPrefix Standard': https://swarm.workshop.perforce.com/projects/perforce-software-sdp/view/main/doc/SDP_Guide.Unix.html#_the_journalprefix_standard As another example, for an edge server and HA of that edge, both servers will use the Second Form of the journalPrefix, the form which incorporates a shortened form of the ServerID into the journalPrefix value. But since the ServerIDs are different, the actual journalPrefix values will be different, even though both are of the Second Form. The common pattern is that, when configured for NFS sharing, the sync_replica.sh script should use the journalPrefix of its target server when determining where to look for a checkpoint and numbered journal to load into the offline_db. #review @mark_zinthefer @robert_cowham |
||
#125 | 29567 | Andy Boutte | Adding option to delivery log and alerts via PagerDuty | ||
#124 | 29519 | C. Thomas Tyler |
Fixed issue with parallel checkpoints not working if the 'bc' utility was not available. |
||
#123 | 29434 | C. Thomas Tyler |
Tweaked code deriving Threads values from user-defined DO_PARALLEL_CHECKPOINT. Added a stand-alone test script for tweaking that snippet of code. |
||
#122 | 29420 | C. Thomas Tyler |
For parallel checkpoints, provide a way to specify '-N' parallel threads. #review-29421 |
||
#121 | 29363 | kathy_rayburn | Add rotation of p4triggers.log to rotate_last_run_logs | ||
#120 | 29316 | C. Thomas Tyler |
Enhanced robustness of start_p4d() and stop_p4d() interaction with systemd, and also in similar logic in load_checkpoint.sh. #review-29317 |
||
#119 | 29247 | C. Thomas Tyler |
Added a single file to indicate that a parallel checkpoint is complete. Added a check for that file before replaying from a parallel checkpoint directory. #review-29248 |
||
#118 | 29232 | C. Thomas Tyler |
Added regression test for new parallel checkpoint feature. #review-29220 |
||
#117 | 29136 | C. Thomas Tyler |
Fixed log name in recreate_offline_sb.sh to avoid colons in name, and changed to typical SDP behavior where most recent log name has no timestamp. |
||
#116 | 29031 | C. Thomas Tyler |
Added 'monitor_metrics.log' to list of rotated logs. Also made minor non-functional Shellcheck compliance tweaks. #review-29032 |
||
#115 | 28771 | C. Thomas Tyler |
Changed email address for Perforce Support. #review-28772 @amo @robert_cowham |
||
#114 | 28624 | C. Thomas Tyler |
Removed unused functions related to parallel checkpoint processing. Parallel checkpoint processing is expected to be added in p4d itself in future releases. This is a non-functional change. #review-28625 |
||
#113 | 28621 | C. Thomas Tyler |
Added support to sync_replica.sh for operation on a replica of an edge server. Fixed related error with erroneous output in backup_functions.sh. #review-28622 |
||
#112 | 28430 | Andy Boutte | forgot to make SNS use short_subject to overcome the SNS subject character limit | ||
#111 | 28421 | C. Thomas Tyler |
verify_sdp.sh v5.20.0: * New checks: /p4/N/bin/p4{d,p,broker}_N need correct symlink target, and must exist if the corresponding _init script exists. For p4d, it can be a symlink (for a case-sensitive instance) or script (for a case-insensitive instance to pass the C1 flag). Either way the target is checked. These checks cannot be skipped or converted to warnings. * Added check that /p4/N/bin/p4{d,p,broker}_N_init scripts have content that matches templates. This can be skipped with '-skip' or reported as mere warnings (with '-warn') with a new and documented 'init' category of test skipping/warning. #review-28422 |
||
#110 | 28277 | Andy Boutte |
Adding support for delivering alert notifications via AWS SNS #review https://jira.perforce.com:8443/browse/CLD-14 |
||
#109 | 28210 | ashaikh |
Fix checkpoint error on forwarding replicas When running the daily_checkpoint.sh script on forwarding replicas, you get the following error: Offline journal replay failed. Abort! This is because the daily_checkpoint.sh is trying to replay a journal that doesn't exist (hasn't been rotated yet). I've created SDP-563 job for this issue. https://swarm.workshop.perforce.com/jobs/SDP-563 These changes have been tested on several forwarding replicas. |
||
#108 | 28191 | C. Thomas Tyler |
Enhanced to remove old $LOGS/journal.NNN files on standby replicas. This is an optional behaviour which must be explicitly enabled by adding a setting to the bottom of p4_N.vars: export SDP_REMOVE_STANDBY_JOURNALS=1 This is useful if a standby replica shares /hxdepots with its P4TARGET server over NFS, and has the same journalPrefix value as the P4TARGET server. In this scenario, the standby will not rotate its journal as the file already exists, having been rotated on the P4TARGET server sharing the same NFS volume. When the journal rotation does not occur, the journal.NNN file is not removed. The feature implmented in this change is a workaround. A better solution could be a p4d enhancement for this specific scenario: job107633 - Add new value of 2 to rpl.journalcopy.location for standby replicas. |
||
#107 | 28188 | C. Thomas Tyler |
Minor internal cosmetic and coding style tweaks in backup_functions.sh. No functional changes. |
||
#106 | 28064 | Robert Cowham | Add some missing log files to remove_old_logs() function | ||
#105 | 27750 | C. Thomas Tyler |
upgrade.sh v4.6.9: * Fixed issue where where patch-only upgrades of instances after the first in a multi-instance environment are skipped. * Corrected error message for scenario where downgrades are attempted; the logic was correct but error message was confusing. verify_sdp.sh v5.17.3: * Extended '-skip version' meaning to also skip new live binary version comparison checks. Related updates: * A call to verify_sdp.sh in the switch_db_files() function in backup_functions.sh now skips the version check. * A call to daily_checkpoint.sh now skips the version check. #review-27743 |
||
#104 | 27722 | C. Thomas Tyler |
Refinements to @27712: * Resolved one out-of-date file (verify_sdp.sh). * Added missing adoc file for which HTML file had a change (WorkflowEnforcementTriggers.adoc). * Updated revdate/revnumber in *.adoc files. * Additional content updates in Server/Unix/p4/common/etc/cron.d/ReadMe.md. * Bumped version numbers on scripts with Version= def'n. * Generated HTML, PDF, and doc/gen files: - Most HTML and all PDF are generated using Makefiles that call an AsciiDoc utility. - HTML for Perl scripts is generated with pod2html. - doc/gen/*.man.txt files are generated with .../tools/gen_script_man_pages.sh. #review-27712 |
||
#103 | 27651 | Russell C. Jackson (Rusty) | Added forwarding-standby number to is_standby check function. | ||
#102 | 27455 | C. Thomas Tyler |
Normalized usage of calls to verify_sdp.sh from other scripts. In some contexts, we may desire "squeaky clean," while in other contexts we may only need assurance that core functions are operating OK. Fixed typo in variable name used by verify_sdp.sh in call from upgrade.sh that prevented local VERIFY_SDP_SKIP_TEST_LIST def'n from having any effect. |
||
#101 | 27207 | C. Thomas Tyler |
upgrade.sh v4.3.0: * Greatly enhanced documentation and examples. * Before doing second journal rotation: - Added wait for 'p4 storage -w' (for 'to or thru' P4D 2019.1). - Added wait for 'p4 upgrades|grep -v completed' (for P4D 2020.2+) * Added check for whether p4broker and p4p were online at the start of upgrade processing. Only start those services that were running at the beginning of processing are now started after the binaries and symlinks are updated. For the broker, only the broker with the default configuration is stopped and started; DFM brokers are ignored by this script (thus making this script compaitble with using DFM brokers). * Fixed bug where '-c' (Protections table comment conversion) would have failed due to 'p4d' addition of 'Update:' field to the Protections table. Also generally enhanced logic to convert Protections table comments. * Added support for operation on proxy-only and broker-only hosts. Processing of upgrades for p4d occur only if /p4/N/bin/p4d_N_init script exists on the machine. * Refined lexigraphical P4D version comparsion checks. verify_sdp.sh v5.12.0: * Added support for proxy-only and broker-only hosts. The existence of a *_init script in the instance bin dir for any of the Helix server binaries p4d/p4p/p4broker indicate they are configured, determining what tests are executed or skipped. * Added check_file_x() function to check for execute bit on files. In backup_functions.sh, fixed is_server_up() to avoid displaying output. #review-27208 |
||
#100 | 27199 | C. Thomas Tyler |
Made is_server_running() function in backup_functions.sh aware of the nuances of of checking whether p4broker, p4d, and p4p are up. For the broker in particular, only the default broker configuration is checked. This will avoid process compatibility issues with customers using DFM (Down for Maintenance) brokers as part of the upgrade procedure, either manually or with the Helix Management System (HMS). This was done by deferring to the *_base scripts for each service type, as these scripts now return reliable exit codes for status. Made p4d_base not write anything to p4d_init.log if only a 'status' check is done. Fixed bug in 'p4d base' status check where it would return a wrong exit code if p4d was up but SSL trust was not established. Removed redundant logic in start_p4[d,p,broker] functions for service status checking. Enhanced p4d_base to clean up temp dir when done. #review-27200 |
||
#99 | 27197 | C. Thomas Tyler |
Fixed an issue where p4d start would fail to recognized that p4d was up if 'p4 trust' needed to be established. Fixed to unreleased behavior. No job filed. #review-27198 |
||
#98 | 27192 | C. Thomas Tyler |
Fixed hang issue during journal rotation is journalPrefix is wrong. The verify_sdp.sh check is now incorporated into daily_checkpiont.sh. When verify_sdp.sh is called by other scripts, '-skip excess,crontab' options are supplied to avoid issues during maintenance windows with possibly overzealous/nitpicky verifications. #review-27193 |
||
#97 | 27188 | C. Thomas Tyler |
Changed start_p4[p,broker]() functions to check for pids rather than use a 'p4 info' check, to avoid dependency on 'p4d' being up. Style normalization: The formal bash 'function' declaration is now used for all function definitions. Removed obsolete logic to follow up a systemd stop for p4d with a SysV init stop call. That had been done to woarkound systemd status reliability issues, but is no longer needed due to robustness improvements in systemd handling in this release, and also changes to disallow SysV init scripts from being used when systemd is in play. Fix to unreleased behavior; no job filed. |
||
#96 | 27153 | C. Thomas Tyler |
Fixed bug where 'offline_db_usable.txt' file was not maintained correctly by rotate_journal.sh. Removed redundant call to check_offline_db_usable() in compare_journal_numbers(). Fixed some missing log capture redirects. #review-27154 |
||
#95 | 27110 | C. Thomas Tyler |
Stop/start robustness enhancements for start/stop_p4*() functions. Added wait loop to start_p4d(), start_p4broker(), and start_p4p() functions and corresponding stop_p4{d/p/broker}() functions. Delays are 1-second intervals up to a configurable maximum number of seconds. Defaults for start are 120 for p4d, 60 each for p4broker and p4p. Defaults for stop are 600 each for p4broker and p4p, but for 'p4d' the wait could cause a hang. This is deemed preferrable over other options. Delays are only incurred as needed. Services that do not start/stop within the alotted time are deemed to have failed to start/stop. Note that while this change is a general robustness enhancement, it is especially important with systemd due to its 'fire and forget' nature when doing a 'sudo systemctl start'. The systemctl command returns immediately and happily even if the p4d startup fails. All 3 start_p4*() and all 3 stop_p4*() functions now have the same "do or die" behavior; they call a 'die' if the service did not stop as requested. When they return, the requested start/stop can be assumed to have completed successfully. Added documentation for new settings in instance_vars.template. Also added doc and example of SDP_AUTOMATION_USERS. #review-27111 |
||
#94 | 27070 | C. Thomas Tyler |
Added backup_functions.sh back into p4d_base. Fixed failing regression tests. |
||
#93 | 27064 | C. Thomas Tyler |
Fixed issue where 'source p4_vars' hangs if load_checkpoint.sh is running. Added new semaphore file, $P4ROOT/P4ROOT_not_usable.txt. This is used in a way similar to 'offline_db_usable.txt' in the offline_db, except that this file only exists when the databases in P4ROOT are not usable. This is the opposite of how offline_db_usable.txt works, because P4ROOT is expected to be usable 99.9% fo the time. p4d_base will refuse to start p4d if this file exists, protecting against possible operator errors (like trying to start p4d when a checkpoint is still loading). Added check_file_dne() function to verify_sdp.sh to confirm a named file does not exist. Added checks in verify_sdp.sh that P4ROOT_not_usable.txt does not exist in P4ROOT or offline_db. Modified switch_db_files() (called by refresh_P4ROOT_from_offline_db.sh) to properly use the new P4ROOT_not_usable.txt safety file. Fixed bugs in p4d_base that could cause p4d_init.log to be overwritten if error output was generated. Removed call to 'backup_functions.sh' in p4d_base, as on balance it added more complexity than needed. #review-27065 |
||
#92 | 27043 | C. Thomas Tyler |
Made 'No checkpoints found' check simpler and more reliable. Fixed bug impacting live_checkpoint.sh operation on platforms where 'find' utility does not support '-printf' option (including Mac OSX High Sierra). #review-27044 |
||
#91 | 26995 | C. Thomas Tyler |
Further refinements to log rotation to handle an edge case where pre-existing gzip log files cause gzip to go interactive. |
||
#90 | 26994 | C. Thomas Tyler |
Fixed issue (encountred in repetitive test suite operations) where a log file called to quickly causes gzip to go interactive. Also refined pushd/popd logic interaction w/LOGFILE defined/undef. |
||
#89 | 26988 | C. Thomas Tyler |
Tweak to pushd/popd to discard stdout. Any error output is retained. |
||
#88 | 26928 | Robert Cowham |
Fix problem with line breaks when testing for journal corruption. Also softened the error message to avoid unnecessary alarm for users! Observed "cd -" not working on AWS Linux box. Changed to pushd/popd. |
||
#87 | 26619 | C. Thomas Tyler |
Silenced 'shellcheck' complaint about quoting right-hand-side of an '=~' test, as testing confirms the code works as intended with the quotes in our usage, and indeed fails with a syntax error of the quotes are removed. No functional change; only added a shellcheck comment. |
||
#86 | 26494 | C. Thomas Tyler |
Updated remove_old_logs() to cleanup refresh_P4ROOT_from_offline_db.sh. remove_old() |
||
#85 | 26478 | C. Thomas Tyler | Enhanced to work with replicas that don't set journalPrefix. | ||
#84 | 26472 | C. Thomas Tyler |
Patch to use dynamic journalPrefix detection. #review-26473 |
||
#83 | 26468 | C. Thomas Tyler |
Adjusted refresh_P4ROOT_from_offline_db.sh to work on maser/edge/replicas. Added logic in functions like p4d_truncate_journal() to make them safe to call on any host, master, replica, or edge. When called on any host other than the master, appropriate behavior is expected. Approving to deliver patch. |
||
#82 | 26456 | C. Thomas Tyler |
Patch to fix issue with refresh_P4ROOT_from_offline_db.sh behavior on replicas. Adjusted behavior for other scripts to ensure proper behaivor when run on replicas vs. edge servers vs. the master server. Approving patch for testing. |
||
#81 | 26407 | C. Thomas Tyler | Working around service stop reliability issue with systemd. | ||
#80 | 26406 | C. Thomas Tyler | Fixed issue where tail of server log is not displayed if server fails on startup. | ||
#79 | 26400 | C. Thomas Tyler |
Added refresh_P4ROOT_from_offline_db.sh. Updated backup_functions.sh to support functionality for db refresh. Upgrade start_p4d() and stop_p4d() to use systemd if available, else use the underlying SysV init scripts. Updated verify_sdp.sh to be called from other scripts (sans its own logging). Added many checks to verify_sdp.sh to support P4ROOT/offline_db swap. Logic in P4ROOT/offline_db swap is more careful about what gets swapped. Added start_p4broker() and stop_p4broker() that behave similarly. More shellcheck compliance. #review-26401 |
||
#78 | 26394 | C. Thomas Tyler |
Provide snapshot hook for daily_checkpoint.sh. Perhaps the most common SDP customization is a tweak to integrate the SDP checkpoint mechanism with site-local capability of the underlying hardware, so that the snapshot is created at the ideal point in time, right after the metadata checkpoint is created. The intent of this change is to reduce the need for such customization by making a well defined hook in the daily checkpoint process for calling a site-specific custom checkpoint script. Key elements: * Made an illustrative sample change to instance_vars.template, to show setting a SNAPSHOT_SCRIPT variable defined only if running on the master. This logic would be customized to meet local needs, e.g. perhaps checking hostname if snapshots can only be run on certiain machines. The custom logic would live in the /p4/common/config/p4_N.vars file. As a for-example, The sample logic shows a commented-out call to an Amazon Web Services (AWS) Elastic Block Store (EBS) snapshot. (This could just as easily reference a NetApp filer snapshot for an on-prem installation.) * A change to dump_checkpoint() in backup_functions.sh to call the snapshot script defined by the $SNAPSHOT_SCRIPT variable if defined. As coded, a failure of either the checkpoint or the snapshot will cause the script to report a failure. However, a failure of the checkpoint will not prevent the snapshot from being attempted. Possible future tweaks: Consider adding a LIMIT_ONE_DAILY_SNAPSHOT setting (akin to the LIMIT_ONE_DAILY_CHECKPOINT setting in the Windows SDP). |
||
#77 | 26221 | C. Thomas Tyler | Corrected typo in comments only; no functional change. | ||
#76 | 26156 | C. Thomas Tyler |
Shellcheck v0.6.0 and style compliance changes. Fixed minor bugs related to capturing output, driven by shellcheck changes. Fixed sync_replica.sh for standby replicas with the configurable rpl.journalcopy.location=1 (SDP-424), removing an unnecessary and broken check. Fixed test for pre-existing checkpoints in function recreate_offline_db_files() so that it checks only for the master server, fixing an issue where it would report "No checkpoints found - run live_checkpoint.sh" when used on a replica where checkpoints might legatimately not exist. Also fixed the actual test itself. Replaced P4COMMITSERVER variable with P4MASTERPORT to support daisy chain scenarios, removing the assumption that all servers target only the master. (This assumption was made only in journal_watch.sh). Enhanced check_vars() to report individual missing environment variables, and to add more info on how to fix environment problems (e.g. adding to p4_vars or p4_N.vars files). Fixed bug in check_dirs() where a missing directory check intended to result in a die() call would result in a syntax error instead. These files have been field tested. |
||
#75 | 25594 | C. Thomas Tyler |
Removed journalPrefix as command line paramter during journal rotation, deferring to db.config values. Removed explicit specification of journalPrefix as a command line argument to 'p4 admin journal' and 'p4d -jj' commands. Specifying the prefix is redundant as journalPrefix values are defined for the master server and any/all replicas/edge servers in db.config, and db.config is the One Source of Truth for journalPrefix. The SDP defines best practice values for journalPrefix, with elements of this in mkrep.sh (setting configurables for replicas) and mkdirs.sh (preparing directories during initial installation). Note that verify_sdp.sh verifies that journalPrefix values are correct as per SDP standards. Also cleaned up comments. #review @mshields |
||
#74 | 25374 | Russell C. Jackson (Rusty) |
New script for performing a parallel checkpoint. Run as follows: parallel_ckp.sh <instance> -P <threads> New script to restore a parallel checkpoint file to the offline database in case a recovery is needed. Run as follows: parallel_ckp_restore.sh <instance> -f <parallel_ckp_file.tgz> -P <threads> |
||
#73 | 25276 | ashaikh |
Fix syntax errors for SDP_ADMIN_PASSWORD_FILE The current backup_functions.sh script isn't working correctly due to syntax errors. When I try to run 'run_if_master.sh 1 echo a' on a master server, nothing happens. After I made the following fixes, it worked as expected. |
||
#72 | 24357 | C. Thomas Tyler |
Added SDP_ADMIN_PASSWORD_FILE variable in p4_vars.template, and also added a default value in backup_functions.sh. Also added comments in p4_vars explaining the 'set +u' bit. Adding SDP_ADMIN_PASSWORD_FILE is an enabling change for an upcoming change to mkrep.sh. Updated p4login and p4login-super.sh to reference this variable. Normalized p4login-super.sh to accept SDP instance parameter, which (as with other scripts) is optional of SDP_INSTANCE is already defined, else required. Also chmod +x p4login-super.sh. #review @robert_cowham |
||
#71 | 24330 | ashaikh |
Add a script to archive/purge revisions based on number of days. This script will allow you to archive files and optionally purge files based on a configurable number of days and minimum revisions that you want to keep. This is useful if you want to keep a certain number of days worth of files instead of a specific number of revisions. This script currently only accepts paths to specific files, it does not support globbing or wildcards. |
||
#70 | 24191 | C. Thomas Tyler |
Submit on behalf of ashaikh after merging/resolving with current tip revision. |
||
#69 | 24189 | ashaikh |
Add a new SDP script to warn and/or rotate live journal due to configurable low disk space condition A new journal_watch.sh script is being introduced with alerting and journal truncate functionality for enviroments with high Perforce activity. Two separate thresholds can be configured, one for a warn alert (notify via email - optional) and another to trigger a journal rotation. Values for the threshold can be defined via K, M, G or a percentage of disk space. These values represent the available disk space on the journal volume (free space minus filesys.P4Journal.min) before the script takes aption. Another optional feature is to enable KEEPJNL override which dynamically calculates the number of journals to keep based on the oldest checkpoint on disk. When this is enabled, KEEPJNL is temporarily overridden during the journal_watch.sh run to prevent removing any journals that may be required to recover from a checkpoint on disk and all the journals required to bring the server back to a current state. This script can be run on a master/commit, edge and replica server. If the edge or replica server is running low on journal space, it will trigger a journal rotation on the master/commit server (based on P4TARGET value), which then will cause the journals to rotate on the edge/replica servers. <code>#review</code> |
||
#68 | 23848 | Robert Cowham |
Missed a fix for the crontab spamming when track=1 If you do p4d -jd - you need to pipe 2>&1 |
||
#67 | 23639 | Robert Cowham | Remove trailing spaces on all lines - important to make line continuations work. | ||
#66 | 23637 | Robert Cowham | Avoid spamming emails from crontab when track=1 | ||
#65 | 23429 | Robert Cowham | Fix a couple of shellcheck warnings | ||
#64 | 23266 | C. Thomas Tyler |
Fixes and Enhancements: * Enabled daily_checkpoint.sh operate on edge servers, to keep /p4/N/offline_db current on those hosts for site-local recovery w/o requiring a site-local replica (though having a site-local replica can still be useful). * Disabled live_checkpoint.sh for edge servers. * More fully support topologies using edge severs, in both geographically distributed and horizaontal scaling "wokspace server" solutions. * Fix broken EDGESERVER value definition. * Modified name of SDP counter that gets set when a checkpoint is taken to incorporate ServerID, so now the counter name will look like lastSDPCheckpoint.master.1, or lastSDPCheckpoint.p4d_edge_sfo, rather than just lastSDPCheckpoint. There will be multiple such counters in a topology that uses edge servers, and/or which takes checkpoints on replicas. * Added comments for all functions. For the master server, journalPrefix remains: /p4/N/checkpoints/p4_N The /p4/N/checkpoints is reserved for writing by the master/commit server only. For non-standby (possibly filtered) replicas and edge serves, journalPrefix is: /p4/N/checkpoints.<ShortServerID>/p4_N.<ShortServerID> Here, ShortServerID is just the ServerID with the 'p4d_' prefix trimmed, since it is redundant in this context. See mkrep.sh, which enshines a ServerID (server spec) naming standard, with values like 'p4d_fr_bos' (forwarding replica in Boston) and p4d_edge_blr (Edge server in Bangalore). So the journalPrefix for the p4d_edge_bos replica would be: /p4/N/checkpoints.edge_bos/p4_N.edge_bos For "standby" (aka journalcopy) replicas, journalPrefix is set to /p4/N/journals.rep. which is written to the $LOGS volume, due to the nature of standby replicas using journalPrefix to write active server logs to pre-rotated journals. Some take-away to be updated in docs: * The /p4/N/checkpoints folder must be reserved for checkpoints that originate on the master. It should be safe to rsync this folder (with --delete if desired) to any replica or edge server. This is consistent with the current SDP. * I want to change 'journals.rep' to 'checkpoints.<ShortServerID>' for non-standby replicas, to ensure that checkpoints and journals taken on those hosts are written to a volume where they are backed up. * In sites with multiple edge serves, some sharing achive files ('workspace servers'), multiple edge servers will share the same SAN. So we one checkpoints dir per ServerID, and we want that dir to be on the /hxdepots volume. Note that the journalPrefix for replicas was a fixed /p4/N/journals.rep. This was on the /hxlogs volume - a presumably fast-for-writes volume, but typically NOT backed up and not very large. This change puts it under /p4/N/checkpoints.* for edge servers and non-standby replicas, but ensures other replica types and edge servers can generate checkpoints to a location that is backed up and has plenty of storage capacity. For standby replicas only (which cannot be filtered), the journalPrefix remains /p4/N/journals.rep on the /hxlogs volume. |
||
#63 | 23228 | Russell C. Jackson (Rusty) | Adding back a fix that I put in revsion 43 that somehow disappered in revision 44. | ||
#62 | 23031 | C. Thomas Tyler |
Simplified stop_p4d() in backup functions to just call the init script. Previously stop_p4d() had 'wait' logic to wait for p4d to stop before trying to stop with a 'kill' signal, but this is no longer needed since the modern init script (with logic in p4d_base) now does a 'kill' anyway, and also has the 'wait' logic and will exit only when p4d is well and truly down. In upgrade.sh, fixed issue where start/stop of p4broker and p4p went directly to the screen instead of the log. Also changed to call start/stop init scripts for p4d directly, just as for other services. Also enhanced upgrade.sh logging: * Log file name to incorporate SDP instance (redundant but nice). * Remove pesky ':' characters from the datestamp in log file name, as ':' chars in file names wreak havoc with 'scp' commands and require escaping on the command line. * Added log comments indicating which databases are being upgraded ($P4ROOT and $OFFLINE_DB). Also added common explaining use of '-t' flag in 'p4d -xu' call for offline databases. |
||
#61 | 23022 | Sven Erik Knop |
Simple fix for daily_checkpoint if the master server has its own server spec. If the master server has a server spec matching the serverid name, the script will check if the server is an edge server. This is done to avoid off-by-1 errors in the journal counter. The logic for the check was broken, though, resulting in checkpoints failing with "checkpoint.xxx.gz already exist, check setup" This fix avoids the problem. Bash script arithmatic is not as easy. |
||
#60 | 22802 | Russell C. Jackson (Rusty) | Fixed the test to check for the variable and do the bitwise mask test correctly. | ||
#59 | 22800 | Russell C. Jackson (Rusty) |
Correct the logic on checking for an edge server. Removed () from the set_vars call that got in via a cut and paste. |
||
#58 | 22679 | Russell C. Jackson (Rusty) | Removed duplicate line that was producing a cron message. | ||
#57 | 22658 | Russell C. Jackson (Rusty) |
Added line to remove the ckp_running.txt file when the checkpoint fails through the die function because the checkpoint is no longer running, and this file prevents the next checkpoint from running successfully. |
||
#56 | 22633 | Russell C. Jackson (Rusty) | Removed Debug and extra echo of journal number to eliminate cron messages. | ||
#55 | 22387 | Robert Cowham |
Fix journal rotation off-by-one error Also make sure that -jj rotation specifies prefix. |
||
#54 | 22345 | C. Thomas Tyler | Another tweak. | ||
#53 | 22343 | C. Thomas Tyler |
Fixed off-by-one error in new offline journal counter calculation logic. Bypassing pre-commit review until test suite runs clean again. #review-22344 |
||
#52 | 22277 | C. Thomas Tyler | Debugging. | ||
#51 | 22276 | C. Thomas Tyler | Debugging. | ||
#50 | 22274 | C. Thomas Tyler |
Fixed bug where detection of journal number fails for new/empty data set. Removed msg() and bail() functions, and changed approach to make the existing log() and die() functions behave correctly regardless of whether $LOGFILE is defined. If $LOGFILE is defined, log() silently write to the log file, otherwise writes to the screen (stdout). If $LOGFILE is defined, die() writes to the log file and sends an email, otherwise writes to the screen (stdout). If on a tty, error is duplicated in stderr. To Do: Improve in-code comments. Bypassing pre-commit review until tests pass. #review-22275 |
||
#49 | 22272 | C. Thomas Tyler |
Enhanced error message in check_journalnum() in backup_functions.hs. Bypassing pre-commit review until tests pass. #review-22273 |
||
#48 | 22270 | C. Thomas Tyler |
Attempting fix of build failure. Bypassing pre-commit review. #review-22271 |
||
#47 | 22250 | C. Thomas Tyler |
Further refinements to the new 'rotate journal on p4d start' change: * Fixed p4d_truncate_journal so it has less environment dependencies (e.g. doesn't depend on LOGFILE, etc.) and doesn't try sending email. * Introduced msg() and bail(), counterparts to log() and die() which don't try to write to LOGFILE and don't try to send email. * Added call to get_journalnum() before call to p4d_truncate_journal(). * Fixed logic in get_journalnum() so it gets the journal number w/o needing p4d to be up. * I think I fixed the syntax error in bitwise operator check when setting EDGE_SERVER. It works on a non-edge server (sets EDGESERVER=0). For now I have it doing an 'echo EDGESERVER=$EDGESERVER', but need to test that it correctly sets EDGESERVER=1 on an edge server. TO DO: Remove that 'echo EDGESERVER=$EDGESERVER' once we verify it correctly sets the value for $EDGESERVER. (Or not?) |
||
#46 | 22239 | Russell C. Jackson (Rusty) |
Change set_vars to look up the edge server directly in the database so the server does not have to be on-line to check. Fix for Job: SDP-223 |
||
#45 | 22066 | Russell C. Jackson (Rusty) | Added rotate for p4verify.log instead of just deleting the prior one. | ||
#44 | 21624 | C. Thomas Tyler |
Fixed issue with mail sending a usage error on Ubuntu, which does not accept the '-V' flag to check the version. |
||
#43 | 21580 | Russell C. Jackson (Rusty) |
Changed compare journal numbers function to only fail if root journal number is greater than offline_db. The not equal check was preventing the recreate_db_sync_replca.sh script from being used to fix a replica that was out of sync with the master. |
||
#42 | 21322 | Russell C. Jackson (Rusty) |
#review-21323 Forgot server.id |
||
#41 | 21318 | Russell C. Jackson (Rusty) |
#review-21319 Added commands to move license*, rdb.lbr and state* from P4ROOT to OFFLINE_DB before switching the links. Added command to remove the db.* files from offline_db/save as well before trying to recreate the offline database. |
||
#40 | 21178 | Russell C. Jackson (Rusty) |
Change the SDP so that root and offline_db can be on different volumes and still accomplish a fast database recovery using recreate_db_checkpoint.sh and recreate_db_sync_replica.sh. This is done by switching the links now rather than moving the db files. |
||
#39 | 20970 | Russell C. Jackson (Rusty) |
Changed to use the standard remove log function on the p4login log. We don't need to keep anymore than the keeplogs specified number of these logs around. It doesn't matter if they are all in the last hour or the last seven days. The only need for a p4login log is for debugging something not working. Anyone that needs long term tracking of logins can turn on the auth structured log to track the logins. |
||
#38 | 20964 | adrian_waters | Include removal of the p4login.*.log files in daily cleanup | ||
#37 | 20940 | Russell C. Jackson (Rusty) |
Drop JOURNALNUM from the rotated log names because it forces you to wait to rotate the prior logs until you get the journal number and creates a problem where the error that you couldn't get the journal number ends up at the end of the previous days log file, and that is what gets email out. That causes confusion for the person trying to see what the error is. Moved all rotate_last_run_logs up to the point right after we set the environment. |
||
#36 | 20822 | C. Thomas Tyler |
Change logic to use p4d init script only from /p4/N/bin. The current logic sets a variable essentially preferring the p4d init script in /etc/init.d, using the one in /p4/N/bin only if the one in /etc/init.d doesn't exist as a file (and would not be selected if it was a symlink). Reasons: * Referencing the file/symlink in /etc/init.d introduces potentially complex and confusing behavior. If there were a file in /etc/init.d rather than symlink'd, that could be bad if it doesn't get upated with new versions of the SDP, where stuff in /p4/N/bin should be reliably updated. * I just expect the SDP to always use its own files in /p4/N/bin, under direct control of the perforce user, rather than external references to it. In a proper SDP deployment on Linux, /etc/init.d should contain symlinks for SDP init scripts anyway. But why trust that if there's no need? * If there is a file in /etc/init.d and it's different than /p4/N/bin for some reason, we should prefer the one in /p4/N/bin. * The sylminks in /etc/init.d are outside the direct control of the perforce user, and could point to who-knows-where. |
||
#35 | 20749 | C. Thomas Tyler |
Approved and committed, but I believe that the shared data setting is always set to false on the master and we should look at fixing that in another change. Enhanced p4login again. Improvements: Default behavior with no arguments gives the desired results. For example, if run on a master, we login on the super user P4USER to P4PORT. If run on a replica/edge and auth.id is set, we login P4USER to the P4TARGET port of the replica. All other login functionality, such as logging in the replication service user on a replica, logging in supplemental automation users, is now accessed via new flags. A usage message is now available via '-h' and '-man' options. The new synopsys is: p4login [<instance>] [-p <port> | -service] [-automation] [-all] The <instance> parameter is the only non-flag positional parameter, and can be ommitted if SDP_INSTANCE is already defined (as is typical when called by scripts). With this change, several other scripts calling either the 'p4login' script or 'p4 login' commands were normalized to call p4login as appropriate given the new usage. Reviewer Note: Review p4login first, then other files. Most changes are in p4login. In other scripts callling p4login, calls similar to: $P4BIN -u $P4USER -p $P4PORT login < /path/to/pwd are replaced with: $P4CBIN/p4login In other scritps calling p4login, calls similar to: $P4BIN -p $P4MASTERPORT login < /path/to/pwd are replaced with: $P4CBIN/p4login -p $P4MASTERPORT Note that, if auth.id is set, calling 'p4login' actually has the same behavior as 'p4login -p $P4MASTERPORT', since p4login called on a replica with auth.id set will just login to the master port anyway. Depending on intent, sometimes $P4BIN/p4login -service is used. == Misc Cleanup == In doing the cleanup: * Fixed a hard-coding-to-instance-1 bug in broker_rotate.sh. * Fixed an inconsistency in recreate_db_sync_replica.sh, where it did just a regular login rather than a login -a as done in other places for (for compatibility with some multi-interface NIC card configs). == p4login Call Normalization == Code cleanup was done to normalize calls to p4login, such that: 1) the call starts with $P4CBIN/p4login (not the hard-coded path), and 2) logic to redirect sdtout/stderr to /dev/null was removed, since it's not necessary with p4login. (And if p4login ever does generate any unwanted output, we only fix it in one place). == Tweak to instance_vars.template == This change includes a tweak to set P4MASTERPORT dynamically on a replica to ensure the value precisely matches P4TARGET for the given replica. This will reduce a source of problems when SSL is used, as it is particularly sensitive to the precise P4PORT values used, and will also help for environments which have not yet set auth.id. If the port cannot be determined dynamically, we fall back to the old logic using the assigned value. == Tweak to SDP_ALWAYS_LOGIN behavior == This used to default to 1, now it defaults to 0. At this point we should no longer need to force logins, and in fact doing so can get into a 'p4 login' hang situation with auth.id set. Best to avoid unnecessary logins if we already have a valid ticket. (I think the need to force a login may have gone away with p4d patches). == Obsolete Script == With this change, svclogin.sh is now obsolete. All it was doing was a few redundant 'p4 login' commands followed by a call to p4login anyway. == Testing == Our test suite doesn't fully cover this change, so additional manual testing was done in the Battle School lab environment. |
||
#34 | 20637 | Russell C. Jackson (Rusty) |
Fixed the real cause of the problem and put the redirects to LOGFILE back. The actual cause of the problem was that we were rotating the sync_replica.log file twice within that function because of the call to rotate $LOGFILE and a second call to rotate "sync_replica.log". I removed the 2nd call to rotate the sync_replica.log. |
||
#33 | 20636 | Russell C. Jackson (Rusty) | Changed mv and gzip in rotate log to go to /dev/null to avoid stomping on the file we just rotated. | ||
#32 | 20170 | Russell C. Jackson (Rusty) |
Moved password and users into the config directory to allow for instance specific users and passwords. Ran into a case where two different teams were sharing the same server hardware and needed this type of differentiation. Surprised that we haven't hit this sooner. Also defaulted mkdirs to use the numeric ports since this is the most common installation. |
||
#31 | 19851 | Robert Cowham |
Check for usable offline_db before creating checkpoint work file. This avoids an error right at the start locking out the utility which will fix said error! |
||
#30 | 19768 | UnstoppableDrew |
@tom_tyler @russell_jackson Bug fix for running p4master_run as root, and some comment header cleanup. Job 000543 p4master_run: Preserve original arguments list and use this when exec'ing as $OSUSER. backup_functions.sh: Add text about sourcing p4_vars yourself instead of using p4master_run. update_limites.py: Run p4login directly without p4master_run since p4login calls p4_vars now. everything else: Remove comment block about needing to run with p4master_run. Reword comment about SDP_INSTANCE since it is not always an integer value. |
||
#29 | 19523 | Russell C. Jackson (Rusty) |
Added a KEEPJNLS variable to allow you to keep more journals than checkpoints in case you rotate the journal more frequently than you run checkpoints. |
||
#28 | 19113 | Russell C. Jackson (Rusty) |
Changed name of daily_backup.sh to daily_checkpoint.sh Changed name of weekly_backup.sh to recreate_db_checkpoint.sh Updated crontabs with new names, and changed to run recreate_db_checkpoint on the 1st Sat. of Jan. and July. For most companies, this is a better practice than recreating weekly per discussion with Anton. Remove solaris crontab since Solaris is pretty much dead, and we don't test on it. Updated docs to reflect name changes, and did a little clean other other sections while I was in there. |
||
#27 | 19105 | Russell C. Jackson (Rusty) |
This change uses p4 admin journal command against the master server to rotate the journal. Added a p4d_truncate_journal to use in weekly_back that still rotates via p4d. The purpose of this change is to allow you to run daily_backup.sh on a standby machine where you have a shared depotdata volume. If you want to use daily on the standby machine, you have to put offline_db on the shared depotdata volume which means you will NOT want to run weekly_backup.sh on the master very often, but that is basically what Anton is recommending now. I am currently testing this setup on a production environment, and if it works well, I will change mkdirs.sh to put offline_db on the depotdata volume by default and update the crontabs not to run weekly anymore. #review-19083 |
||
#26 | 18934 | C. Thomas Tyler |
Moved ckp_runnig.txt to $LOGS (/p4/n/logs) from /p4/n/checkpoints: * Avoids it getting rsync'd by sync_replica.sh or by common human admin rsyncs of the /p4/n/checkpoints dir. * It should be in a volume that's not shared. * Puts it in the logs directory where you go look when things break. |
||
#25 | 18617 | Russell C. Jackson (Rusty) |
#review-18610 Fixed a bug with check_journalnum where it was being called to check the offline journal number, but the function was hard coded to JOURNALNUM. Implemented a function to compare the journal numbers of P4ROOT and OFFLINE_DB before switching the db files as an extra layer of protection to avoid data loss. |
||
#24 | 18595 | Russell C. Jackson (Rusty) |
Fixed a log rotation bug that has been around for a long time. If you rotated the journal more times than KEEPCKPS and KEEPLOGS, the old method would remove all of your logs and checkpoints because it didn't actually look at how many were on disk. Found the bug while reviewing the test harness with Robert. Adjusted the test harness to account for the change. (Stole from Robert's shelf.) |
||
#23 | 18590 | Robert Cowham |
Fix failing tests. Change log filename format to use - instead of : as seperator for date/time component |
||
#22 | 18587 | Russell C. Jackson (Rusty) |
Reworked the log rotation stuff in backup_functions.sh to make it cleaner and handle the new log from recreate_offline_db.sh. Modified recreate_offline_db.sh to add comments about a bad checkpoint. Also made it create its own log file since it isn't doing a checkpoint. Removed the log rotation for the same reason. Moved the LOGFILE setting out to all of scripts to make it more obvious for future scripts that you need to set that variable in your script so that it doesn't just default to checkpoint.log. Moved the functions in weekly_backup.sh and recreate_offline_db.sh into backup_functions.sh where they belong for consistency. Modified backup_functions.sh to use a consistent naming convention for all the rotated log files rather than checkpoint.log being unique. Replaced all back ticks with the newer bash $() method. Removed all of the line wrapping since I am pretty sure that none of us are working on an 80 character terminal these days and it is easier to read this way. |
||
#21 | 18533 | Robert Cowham |
Put a date/time suffix onto checkpoint.log.* files in case of any errors to avoid them being overwritten. Make remove_old_logs tidy up appropriately. |
||
#20 | 18532 | Robert Cowham | Correct log message regarding journals replays | ||
#19 | 18484 | Russell C. Jackson (Rusty) | Added comment on WAITCOUNT to explain the value. | ||
#18 | 18450 | Russell C. Jackson (Rusty) |
Added a kill for the p4d_stop function in case p4d doesn't shut down. In the process of testing this, I discovered that using $P4DBIN in this case was a bug that didn't work when running in case insensitive mode because the executable doesn't match what is actually running since we end up calling p4d from /p4/common/bin. Corrected the grep so that it would match in either case. #review-18430 |
||
#17 | 16335 | C. Thomas Tyler |
Routine Merge Down to dev from main using: p4 merge -b perforce_software-sdp-dev |
||
#16 | 16029 | C. Thomas Tyler |
Routine merge to dev from main using: p4 merge -b perforce_software-sdp-dev |
||
#15 | 15797 | C. Thomas Tyler | Routine Merge Down to dev from main for SDP. | ||
#14 | 15778 | C. Thomas Tyler | Routine Merge Down to dev from main. | ||
#13 | 15376 | adrian_waters | formatting only - fix spacing; there's inconsistent use of tabs/spaces throughout the file - needs cleanup at some point. | ||
#12 | 15375 | adrian_waters | Routine merge-down from main->dev | ||
#11 | 15374 | adrian_waters |
- Ensure backup scripts are run as the OSUSER (to prevent accidental running as root); - in scripts where LOGFILE value is changed from the 'checkpoint.log' set by set_vars, ensure the new assignment is before check_dirs is called, otherwise errors could be written to the 'wrong' log - in 'die()' - detect if running from terminal & also send output to stderr |
||
#10 | 13931 | C. Thomas Tyler | Routine merge-down to dev from main. | ||
#9 | 13906 | C. Thomas Tyler |
Normalized P4INSTANCE to SDP_INSTANCE to get Unix/Windows implementations in sync. Reasons: 1. Things that interact with SDP in both Unix and Windows environments shoudn't have to account for this obscure SDP difference between Unix and Windows. (I came across this doing CBD work). 2. The Windows and Unix scripts have different variable names for defining the same concept, the SDP instance. Unix uses P4INSTANCE, while Windows uses SDP_INSTANCE. 3. This instance tag, a data set identifier, is an SDP concept. I prefer the SDP_INSTANCE name over P4INSTANCE, so I prpose to normalize to SDP_INSTANCE. 4. The P4INSTANCE name makes it look like a setting that might be recognized by the p4d itself, which it is not. (There are other such things such as P4SERVER that could perhaps be renamed as a separate task; but I'm not sure we want to totally disallow the P4 prefix for variable names. It looks too right to be wrong in same cases, like P4BIN and P4DBIN. That's a discussion for another day, outside the scope of this task). Meanwhile: * Fixed a bug in the Windows 2013.3 upgrade script that was referencing undefined P4INSTANCE, as the Windows environment defined only SDP_INSTANCE. * Had P4INSTANCE been removed completely, this change would likely cause trouble for users doing updates for existing SDP installations. So, though it involves slight technical debt, I opted to keep a redundant definition of P4INSTANCE in p4_vars.template, with comments indicating SDP_INSTANCE should be used in favor of P4INSTANCE, with a warning that P4INSTANCE may go away in a future release. This should avoid unnecessary upgrade pain. * In mkdirs.sh, the varialbe name was INSTANCE rather than SDP_INSTANCE. I changed that as well. That required manual change rather than sub/replace to avoid corrupting other similar varialbe names (e.g. MASTERINSTANCE). This is a trivial change technically (a substitute/replace, plus tweaks in p4_vars.template), but impacts many files. |
||
#8 | 12169 | Russell C. Jackson (Rusty) |
Updated copyright date to 2015 Updated shell scripts to require an instance parameter to eliminate the need for calling p4master_run. Python and Perl still need it since you have to set the environment for them to run in. Incorporated comments from reviewers. Left the . instead of source as that seems more common in the field and has the same functionality. |
||
#7 | 12028 | C. Thomas Tyler | Refreshed SDP dev branch, merging down from main. | ||
#6 | 11541 | Russell C. Jackson (Rusty) | Keeping dev up to date. | ||
#5 | 11535 | Russell C. Jackson (Rusty) | Updated dev from main. | ||
#4 | 11509 | Russell C. Jackson (Rusty) |
Added sync_replica.log to backup function log rotations, and added rm on existing gzipped logs with the same name in order to keep the script from hanging waiting for a response to overwrite. Added sync_shared_replica.sh and weekly_sync_shared_replica.sh to support replicas with shared depotdata storage. No rsync is necessary. The logs volume must not be a shared volume with these scripts though. |
||
#3 | 11483 | Russell C. Jackson (Rusty) | Brought over changes from RCJ backup_functions.sh | ||
#2 | 11463 | Russell C. Jackson (Rusty) | Updated dev to prepare for Summit agreed changes. | ||
#1 | 10638 | C. Thomas Tyler | Populate perforce_software-sdp-dev. | ||
//guest/perforce_software/sdp/main/Server/Unix/p4/common/bin/backup_functions.sh | |||||
#1 | 10148 | C. Thomas Tyler | Promoted the Perforce Server Deployment Package to The Workshop. |