Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- replicate 2014-09-26 15:10:50.000000000 +0200
- +++ replicate.new 2014-09-26 15:33:22.000000000 +0200
- @@ -84,7 +84,7 @@
- echo "echo \"\`date\`: Initial snapshot(s) created\" >> $log" >> ${cmd}
- # Replicate data:
- - echo "sudo ${SEND} $lfs$l_old 2>> ${ERR} | sudo zfs recv -dFu $lp 2>> ${ERR}" >> ${cmd}
- + echo "sudo ${SEND} $lfs$l_old 2>> ${ERR} | sudo zfs recv -du $lp 2>> ${ERR}" >> ${cmd}
- echo errorcheck >> ${cmd}
- echo "echo \"\`date\`: Data replicated\" >> $log" >> ${cmd}
- @@ -146,7 +146,7 @@
- echo "echo \"\`date\`: Initial snapshot(s) created\" >> $log" >> ${cmd}
- # Replicate data:
- - echo "sudo ${SEND} $lfs$r_old 2>> ${ERR} | ${SSH} $rh sudo zfs recv -dFu $rp/$lh 2>> ${ERR}" >> ${cmd}
- + echo "sudo ${SEND} $lfs$r_old 2>> ${ERR} | ${SSH} $rh sudo zfs recv -du $rp/$lh 2>> ${ERR}" >> ${cmd}
- echo errorcheck >> ${cmd}
- echo "echo \"\`date\`: Data replicated\" >> $log" >> ${cmd}
- @@ -228,7 +228,7 @@
- echo "sudo ${SNAPSHOT} $lfs$l_old 2>> ${ERR}" >> ${cmd}
- echo errorcheck >> ${cmd}
- echo "echo \"\`date\`: Base snapshot(s) created\" >> $log" >> ${cmd}
- - echo "sudo ${SEND} $lfs$l_old 2>> ${ERR} | sudo zfs recv -dFu $lp 2>> ${ERR}" >> ${cmd}
- + echo "sudo ${SEND} $lfs$l_old 2>> ${ERR} | sudo zfs recv -du $lp 2>> ${ERR}" >> ${cmd}
- echo errorcheck >> ${cmd}
- echo "echo \"\`date\`: Data replicated\" >> $log" >> ${cmd}
- echo "echo \"\`date\`: Rebaseline complete\" >> $log" >> ${cmd}
- @@ -243,9 +243,9 @@
- if [ "$r" = "yes" ]
- then
- - DODRYRUN=`zfs send -vRi $lfs$l_old $lfs$l_new 2> ${DRYRUNOUT} | zfs recv -vdFn $lp 2>> ${DRYRUNOUT}`
- + DODRYRUN=`zfs send -vRi $lfs$l_old $lfs$l_new 2> ${DRYRUNOUT} | zfs recv -vdn $lp 2>> ${DRYRUNOUT}`
- else
- - DODRYRUN=`zfs send -vi $lfs$l_old $lfs$l_new 2> ${DRYRUNOUT} | zfs recv -vdFn $lp 2>> ${DRYRUNOUT}`
- + DODRYRUN=`zfs send -vi $lfs$l_old $lfs$l_new 2> ${DRYRUNOUT} | zfs recv -vdn $lp 2>> ${DRYRUNOUT}`
- fi
- DRYRUNOK=`egrep '(could not send|cannot receive)' ${DRYRUNOUT} | wc -l | sed 's/^[ \t]*//'`
- @@ -499,7 +499,7 @@
- fi
- # Replicate data:
- - echo "sudo ${SEND} -i $lfs$l_old $lfs$l_new 2>> ${ERR} | sudo zfs recv -dFu $lp 2>> ${ERR}" >> ${cmd}
- + echo "sudo ${SEND} -i $lfs$l_old $lfs$l_new 2>> ${ERR} | sudo zfs recv -du $lp 2>> ${ERR}" >> ${cmd}
- echo errorcheck >> ${cmd}
- echo "echo \"\`date\`: Data replicated\" >> $log" >> ${cmd}
- @@ -636,7 +636,7 @@
- echo "sudo ${SNAPSHOT} $lfs$r_old 2>> ${ERR}" >> ${cmd}
- echo errorcheck >> ${cmd}
- echo "echo \"\`date\`: Base snapshot(s) created\" >> $log" >> ${cmd}
- - echo "sudo ${SEND} $lfs$r_old 2>> ${ERR} | ${SSH} $rh sudo zfs recv -dFu $rp/$lh 2>> ${ERR}" >> ${cmd}
- + echo "sudo ${SEND} $lfs$r_old 2>> ${ERR} | ${SSH} $rh sudo zfs recv -du $rp/$lh 2>> ${ERR}" >> ${cmd}
- echo errorcheck >> ${cmd}
- echo "echo \"\`date\`: Data replicated\" >> $log" >> ${cmd}
- echo "echo \"\`date\`: Rebaseline complete\" >> $log" >> ${cmd}
- @@ -651,9 +651,9 @@
- if [ "$r" = "yes" ]
- then
- - DODRYRUN=`zfs send -vRi $lfs$r_old $lfs$r_new 2> ${DRYRUNOUT} | ${SSH} -i ${REPID} replicator@$rh sudo zfs recv -vdFn $rp/$lh 2>> ${DRYRUNOUT}`
- + DODRYRUN=`zfs send -vRi $lfs$r_old $lfs$r_new 2> ${DRYRUNOUT} | ${SSH} -i ${REPID} replicator@$rh sudo zfs recv -vdn $rp/$lh 2>> ${DRYRUNOUT}`
- else
- - DODRYRUN=`zfs send -vi $lfs$r_old $lfs$r_new 2> ${DRYRUNOUT} | ${SSH} -i ${REPID} replicator@$rh sudo zfs recv -vdFn $rp/$lh 2>> ${DRYRUNOUT}`
- + DODRYRUN=`zfs send -vi $lfs$r_old $lfs$r_new 2> ${DRYRUNOUT} | ${SSH} -i ${REPID} replicator@$rh sudo zfs recv -vdn $rp/$lh 2>> ${DRYRUNOUT}`
- fi
- DRYRUNOK=`egrep '(could not send|cannot receive)' ${DRYRUNOUT} | wc -l | sed 's/^[ \t]*//'`
- @@ -907,7 +907,7 @@
- fi
- # Replicate data:
- - echo "sudo ${SEND} -i $lfs$r_old $lfs$r_new 2>> ${ERR} | ${SSH} $rh sudo zfs recv -dFu $rp/$lh 2>> ${ERR}" >> ${cmd}
- + echo "sudo ${SEND} -i $lfs$r_old $lfs$r_new 2>> ${ERR} | ${SSH} $rh sudo zfs recv -du $rp/$lh 2>> ${ERR}" >> ${cmd}
- echo errorcheck >> ${cmd}
- echo "echo \"\`date\`: Data replicated\" >> $log" >> ${cmd}
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement