Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Lorenzo Martinico
slapos
Commits
3e0d0fb0
Commit
3e0d0fb0
authored
Oct 10, 2014
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added --fix-corrupted argument to pull_raw
parent
23f5d07d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
47 additions
and
5 deletions
+47
-5
slapos/recipe/pbs.py
slapos/recipe/pbs.py
+46
-5
software/slaprunner/software.cfg
software/slaprunner/software.cfg
+1
-0
No files found.
slapos/recipe/pbs.py
View file @
3e0d0fb0
...
@@ -110,22 +110,62 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
...
@@ -110,22 +110,62 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
# Pull data from a PBS *-export instance.
# Pull data from a PBS *-export instance.
#
#
sigint()
{
exit 1
}
trap sigint SIGINT # we can CTRL-C for ease of debugging
LC_ALL=C
LC_ALL=C
export LC_ALL
export LC_ALL
is_first_backup=$(test -d %(rdiff_backup_data)s || echo yes)
is_first_backup=$(test -d %(rdiff_backup_data)s || echo yes)
RDIFF_BACKUP=%(rdiffbackup_binary)s
RDIFF_BACKUP=%(rdiffbackup_binary)s
TMPDIR=%(tmpdir)s
BACKUP_DIR=%(local_dir)s
CORRUPTED_MSG="^Warning:
\
Compu
t
ed
\
SHA
1
\
diges
t
\
o
f
\
"
CANTFIND_MSG="^Warning:
\
C
a
nnot
\
f
ind
\
SHA
1
\
diges
t
\
f
or
\
f
ile
\
"
CORRUPTED_FILE=$TMPDIR/$$.rdiff_corrupted
CANTFIND_FILE=$TMPDIR/$$.rdiff_cantfind
SUCCEEDED=false
SUCCEEDED=false
while ! $SUCCEEDED; do
while ! $SUCCEEDED; do
# not using --fix-corrupted can lead to an infinite loop
# in case of manual changes to the backup repository.
CORRUPTED_ARGS=""
if [ "$1" == "--fix-corrupted" ]; then
VERIFY=$($RDIFF_BACKUP --verify $BACKUP_DIR 2>&1 >/dev/null)
echo "$VERIFY" | egrep "$CORRUPTED_MSG" | sed "s/$CORRUPTED_MSG//g" > $CORRUPTED_FILE
# Sometimes --verify reports this spurious warning:
echo "$VERIFY" | egrep "$CANTFIND_MSG" | sed "s/$CANTFIND_MSG
\
(.*
\
),/--always-snapshot
\
'
\
\
1'/g" > $CANTFIND_FILE
# There can be too many files, better not to provide them through separate command line parameters
CORRUPTED_ARGS="--always-snapshot-fromfile $CORRUPTED_FILE --always-snapshot-fromfile $CANTFIND_FILE"
if [ -s "$CORRUPTED_FILE" -o -s "$CANTFIND_FILE" ]; then
echo Retransmitting $(cat "$CORRUPTED_FILE" "$CANTFIND_FILE" | wc -l) corrupted/missing files
else
echo "No corrupted or missing files to retransmit"
fi
fi
$RDIFF_BACKUP
\
\
$RDIFF_BACKUP
\
\
$CORRUPTED_ARGS
\
\
--remote-schema %(remote_schema)s
\
\
--remote-schema %(remote_schema)s
\
\
%(remote_dir)s
\
\
%(remote_dir)s
\
\
%(local_dir)s
$BACKUP_DIR
[ "$CORRUPTED_ARGS" ] && rm -f "$CORRUPTED_FILE" "$CANTFIND_FILE"
if [ ! $? -eq 0 ]; then
if [ ! $? -eq 0 ]; then
# Check the backup, go to the last consistent backup, so that next
# Check the backup, go to the last consistent backup, so that next
# run will be okay.
# run will be okay.
echo "Checking backup directory..."
echo "Checking backup directory..."
$RDIFF_BACKUP --check-destination-dir
%(local_dir)s
$RDIFF_BACKUP --check-destination-dir
$BACKUP_DIR
if [ ! $? -eq 0 ]; then
if [ ! $? -eq 0 ]; then
# Here, two possiblities:
# Here, two possiblities:
if [ is_first_backup ]; then
if [ is_first_backup ]; then
...
@@ -141,13 +181,13 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
...
@@ -141,13 +181,13 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
fi
fi
else
else
# Everything's okay, cleaning up...
# Everything's okay, cleaning up...
$RDIFF_BACKUP --remove-older-than %(remove_backup_older_than)s --force
%(local_dir)s
$RDIFF_BACKUP --remove-older-than %(remove_backup_older_than)s --force
$BACKUP_DIR
fi
fi
SUCCEEDED=true
SUCCEEDED=true
if [ -e %(backup_signature)s ]; then
if [ -e %(backup_signature)s ]; then
cd
%(local_dir)s
cd
$BACKUP_DIR
find -type f ! -name backup.signature ! -wholename "./rdiff-backup-data/*" -print0 | xargs -P4 -0 sha256sum | LC_ALL=C sort -k 66 > ../proof.signature
find -type f ! -name backup.signature ! -wholename "./rdiff-backup-data/*" -print0 | xargs -P4 -0 sha256sum | LC_ALL=C sort -k 66 > ../proof.signature
cmp backup.signature ../proof.signature || SUCCEEDED=false
cmp backup.signature ../proof.signature || SUCCEEDED=false
diff -ruw backup.signature ../proof.signature > ../backup.diff
diff -ruw backup.signature ../proof.signature > ../backup.diff
...
@@ -156,7 +196,7 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
...
@@ -156,7 +196,7 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
# instead do a push it to the clone.
# instead do a push it to the clone.
fi
fi
$SUCCEEDED || find
%(local_dir)s -name rdiff-backup.tmp.* -exec rm -
f {}
\
;
$SUCCEEDED || find
$BACKUP_DIR -name rdiff-backup.tmp.* -exec rm -r
f {}
\
;
done
done
"""
)
"""
)
...
@@ -167,6 +207,7 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
...
@@ -167,6 +207,7 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
'remote_schema'
:
shlex
.
quote
(
remote_schema
),
'remote_schema'
:
shlex
.
quote
(
remote_schema
),
'remote_dir'
:
shlex
.
quote
(
remote_dir
),
'remote_dir'
:
shlex
.
quote
(
remote_dir
),
'local_dir'
:
shlex
.
quote
(
local_dir
),
'local_dir'
:
shlex
.
quote
(
local_dir
),
'tmpdir'
:
'/tmp'
,
'remove_backup_older_than'
:
shlex
.
quote
(
remove_backup_older_than
)
'remove_backup_older_than'
:
shlex
.
quote
(
remove_backup_older_than
)
}
}
...
...
software/slaprunner/software.cfg
View file @
3e0d0fb0
...
@@ -20,6 +20,7 @@ gitdb = 0.5.4
...
@@ -20,6 +20,7 @@ gitdb = 0.5.4
gunicorn = 19.1.1
gunicorn = 19.1.1
plone.recipe.command = 1.1
plone.recipe.command = 1.1
pycrypto = 2.6.1
pycrypto = 2.6.1
slapos.recipe.build = 0.12
slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.download = 1.0.dev-r4053
slapos.toolbox = 0.40.4
slapos.toolbox = 0.40.4
smmap = 0.8.2
smmap = 0.8.2
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment