Advertisement
Guest User

Untitled

a guest
Sep 26th, 2014
234
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 4.13 KB | None | 0 0
  1. --- replicate 2014-09-26 15:10:50.000000000 +0200
  2. +++ replicate.new 2014-09-26 15:33:22.000000000 +0200
  3. @@ -84,7 +84,7 @@
  4. echo "echo \"\`date\`: Initial snapshot(s) created\" >> $log" >> ${cmd}
  5.  
  6. # Replicate data:
  7. - echo "sudo ${SEND} $lfs$l_old 2>> ${ERR} | sudo zfs recv -dFu $lp 2>> ${ERR}" >> ${cmd}
  8. + echo "sudo ${SEND} $lfs$l_old 2>> ${ERR} | sudo zfs recv -du $lp 2>> ${ERR}" >> ${cmd}
  9. echo errorcheck >> ${cmd}
  10. echo "echo \"\`date\`: Data replicated\" >> $log" >> ${cmd}
  11.  
  12. @@ -146,7 +146,7 @@
  13. echo "echo \"\`date\`: Initial snapshot(s) created\" >> $log" >> ${cmd}
  14.  
  15. # Replicate data:
  16. - echo "sudo ${SEND} $lfs$r_old 2>> ${ERR} | ${SSH} $rh sudo zfs recv -dFu $rp/$lh 2>> ${ERR}" >> ${cmd}
  17. + echo "sudo ${SEND} $lfs$r_old 2>> ${ERR} | ${SSH} $rh sudo zfs recv -du $rp/$lh 2>> ${ERR}" >> ${cmd}
  18. echo errorcheck >> ${cmd}
  19. echo "echo \"\`date\`: Data replicated\" >> $log" >> ${cmd}
  20.  
  21. @@ -228,7 +228,7 @@
  22. echo "sudo ${SNAPSHOT} $lfs$l_old 2>> ${ERR}" >> ${cmd}
  23. echo errorcheck >> ${cmd}
  24. echo "echo \"\`date\`: Base snapshot(s) created\" >> $log" >> ${cmd}
  25. - echo "sudo ${SEND} $lfs$l_old 2>> ${ERR} | sudo zfs recv -dFu $lp 2>> ${ERR}" >> ${cmd}
  26. + echo "sudo ${SEND} $lfs$l_old 2>> ${ERR} | sudo zfs recv -du $lp 2>> ${ERR}" >> ${cmd}
  27. echo errorcheck >> ${cmd}
  28. echo "echo \"\`date\`: Data replicated\" >> $log" >> ${cmd}
  29. echo "echo \"\`date\`: Rebaseline complete\" >> $log" >> ${cmd}
  30. @@ -243,9 +243,9 @@
  31.  
  32. if [ "$r" = "yes" ]
  33. then
  34. - DODRYRUN=`zfs send -vRi $lfs$l_old $lfs$l_new 2> ${DRYRUNOUT} | zfs recv -vdFn $lp 2>> ${DRYRUNOUT}`
  35. + DODRYRUN=`zfs send -vRi $lfs$l_old $lfs$l_new 2> ${DRYRUNOUT} | zfs recv -vdn $lp 2>> ${DRYRUNOUT}`
  36. else
  37. - DODRYRUN=`zfs send -vi $lfs$l_old $lfs$l_new 2> ${DRYRUNOUT} | zfs recv -vdFn $lp 2>> ${DRYRUNOUT}`
  38. + DODRYRUN=`zfs send -vi $lfs$l_old $lfs$l_new 2> ${DRYRUNOUT} | zfs recv -vdn $lp 2>> ${DRYRUNOUT}`
  39. fi
  40.  
  41. DRYRUNOK=`egrep '(could not send|cannot receive)' ${DRYRUNOUT} | wc -l | sed 's/^[ \t]*//'`
  42. @@ -499,7 +499,7 @@
  43. fi
  44.  
  45. # Replicate data:
  46. - echo "sudo ${SEND} -i $lfs$l_old $lfs$l_new 2>> ${ERR} | sudo zfs recv -dFu $lp 2>> ${ERR}" >> ${cmd}
  47. + echo "sudo ${SEND} -i $lfs$l_old $lfs$l_new 2>> ${ERR} | sudo zfs recv -du $lp 2>> ${ERR}" >> ${cmd}
  48. echo errorcheck >> ${cmd}
  49. echo "echo \"\`date\`: Data replicated\" >> $log" >> ${cmd}
  50.  
  51. @@ -636,7 +636,7 @@
  52. echo "sudo ${SNAPSHOT} $lfs$r_old 2>> ${ERR}" >> ${cmd}
  53. echo errorcheck >> ${cmd}
  54. echo "echo \"\`date\`: Base snapshot(s) created\" >> $log" >> ${cmd}
  55. - echo "sudo ${SEND} $lfs$r_old 2>> ${ERR} | ${SSH} $rh sudo zfs recv -dFu $rp/$lh 2>> ${ERR}" >> ${cmd}
  56. + echo "sudo ${SEND} $lfs$r_old 2>> ${ERR} | ${SSH} $rh sudo zfs recv -du $rp/$lh 2>> ${ERR}" >> ${cmd}
  57. echo errorcheck >> ${cmd}
  58. echo "echo \"\`date\`: Data replicated\" >> $log" >> ${cmd}
  59. echo "echo \"\`date\`: Rebaseline complete\" >> $log" >> ${cmd}
  60. @@ -651,9 +651,9 @@
  61.  
  62. if [ "$r" = "yes" ]
  63. then
  64. - 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}`
  65. + 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}`
  66. else
  67. - 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}`
  68. + 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}`
  69. fi
  70.  
  71. DRYRUNOK=`egrep '(could not send|cannot receive)' ${DRYRUNOUT} | wc -l | sed 's/^[ \t]*//'`
  72. @@ -907,7 +907,7 @@
  73. fi
  74.  
  75. # Replicate data:
  76. - echo "sudo ${SEND} -i $lfs$r_old $lfs$r_new 2>> ${ERR} | ${SSH} $rh sudo zfs recv -dFu $rp/$lh 2>> ${ERR}" >> ${cmd}
  77. + echo "sudo ${SEND} -i $lfs$r_old $lfs$r_new 2>> ${ERR} | ${SSH} $rh sudo zfs recv -du $rp/$lh 2>> ${ERR}" >> ${cmd}
  78. echo errorcheck >> ${cmd}
  79. echo "echo \"\`date\`: Data replicated\" >> $log" >> ${cmd}
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement