diff options
| author | n-peugnet <n.peugnet@free.fr> | 2021-10-19 14:21:15 +0200 |
|---|---|---|
| committer | n-peugnet <n.peugnet@free.fr> | 2021-10-19 14:21:15 +0200 |
| commit | 157e94222bc72ebc27a05f694ca8e9558435ab5a (patch) | |
| tree | 02e6f982ab5a4093f78a848daf3cd8d1bb4e0cbf | |
| parent | e79080490330a0c7d36bd85935c04200c63aa185 (diff) | |
| download | dna-backup-157e94222bc72ebc27a05f694ca8e9558435ab5a.tar.gz dna-backup-157e94222bc72ebc27a05f694ca8e9558435ab5a.zip | |
update scripts and README
| -rw-r--r-- | README.md | 114 | ||||
| -rw-r--r-- | exp/Makefile | 9 | ||||
| -rwxr-xr-x | exp/exp.sh | 10 |
3 files changed, 72 insertions, 61 deletions
@@ -285,78 +285,78 @@ Commits journaliers : ``` =============================== SUMMARY =============================== - dna_4k dna_8k diffs nopack targz real - 66,026,534 60,083,471 47,011,621 63,237,214 47,582,036 201,476,675 - 8,010 12,882 2,625 88,673 47,580,422 201,472,392 - 8,368,117 9,854,802 3,270,798 26,668,802 48,699,094 206,006,230 - 203,941 107,870 496 24,839 48,699,144 206,006,227 - 214,572 121,041 1,475 318,053 48,699,266 206,006,571 - 254,132 161,759 3,271,631 107,651 47,592,358 201,472,618 - 419,776 395,453 99,337 2,758,951 47,579,804 201,420,809 - 72,677 86,780 127,793 561,940 47,578,309 201,415,269 - 153,987 75,273 19,221 10,035 47,590,552 201,467,847 - 299,196 224,155 250,581 1,203,018 47,719,274 202,032,972 - 40,413 39,673 19,555 550,478 47,721,098 202,042,129 - 158,232 79,739 203 45,564 47,721,112 202,042,114 - 182,559 116,565 12,419 284,765 47,725,696 202,057,720 - 12,368 13,040 5,823 76,010 47,731,040 202,065,875 - 23,134 28,412 13,370 528,743 47,738,360 202,078,613 - 26,724 33,395 10,837 374,955 47,735,904 202,078,276 - 71,352 84,410 69,707 498,918 47,771,130 202,216,013 + 4k_export 8k_export diffs nopack targz real + 46,080,540 46,021,380 47,011,621 63,237,214 47,582,036 201,476,675 + 8,160 13,260 2,625 88,673 47,580,422 201,472,392 + 6,453,540 8,091,660 3,270,798 26,668,802 48,699,094 206,006,230 + 205,020 108,120 496 24,839 48,699,144 206,006,227 + 214,200 121,380 1,475 318,053 48,699,266 206,006,571 + 255,000 162,180 3,271,631 107,651 47,592,358 201,472,618 + 393,720 358,020 99,337 2,758,951 47,579,804 201,420,809 + 67,320 78,540 127,793 561,940 47,578,309 201,415,269 + 155,040 75,480 19,221 10,035 47,590,552 201,467,847 + 286,620 205,020 250,581 1,203,018 47,719,274 202,032,972 + 39,780 38,760 19,555 550,478 47,721,098 202,042,129 + 159,120 80,580 203 45,564 47,721,112 202,042,114 + 182,580 115,260 12,419 284,765 47,725,696 202,057,720 + 13,260 14,280 5,823 76,010 47,731,040 202,065,875 + 23,460 28,560 13,370 528,743 47,738,360 202,078,613 + 27,540 33,660 10,837 374,955 47,735,904 202,078,276 + 68,340 81,600 69,707 498,918 47,771,130 202,216,013 ================================ TOTAL ================================ - 76,535,724 71,518,720 54,187,492 97,338,609 813,464,599 3,443,358,350 + 54,633,240 55,627,740 54,187,492 97,338,609 813,464,599 3,443,358,350 ``` Commits hebdomadaires : ``` =============================== SUMMARY =============================== - dna_4k dna_8k diffs nopack targz real - 65,996,508 60,066,667 47,003,541 63,221,563 47,569,933 201,420,809 - 889,756 985,651 395,080 6,358,050 47,723,749 202,065,875 - 8,109,685 9,714,907 2,994,599 25,581,925 48,700,415 206,003,757 - 205,101 108,968 407 50,815 48,700,637 206,003,795 - 225,841 144,120 8,679 401,381 48,698,820 206,005,265 - 1,657,786 2,050,048 579,422 6,943,222 48,733,791 206,098,060 - 1,206,672 1,495,828 360,710 4,799,958 48,840,759 206,648,359 - 1,926,509 2,385,637 738,359 4,983,831 48,892,096 206,834,840 - 2,263,134 2,498,842 1,389,502 7,767,439 49,297,747 209,328,856 - 592,440 861,038 146,129 2,899,286 49,331,055 209,479,362 - 198,407 264,136 47,436 1,385,568 49,333,845 209,503,564 - 155,538 266,689 37,183 1,808,603 49,338,373 209,509,777 - 102,087 136,482 23,924 1,555,868 49,336,559 209,515,352 - 4,044,866 4,845,345 1,404,256 11,037,484 49,933,159 211,878,380 - 6,529,456 7,605,526 2,326,692 17,577,030 50,214,110 212,941,025 - 1,258,880 1,658,700 304,617 6,594,520 50,293,382 213,254,405 - 840,200 1,051,378 258,512 4,016,395 50,398,489 213,650,745 + 4k_export 8k_export diffs nopack targz real + 46,086,660 46,003,020 47,003,541 63,221,563 47,569,933 201,420,809 + 701,760 820,080 395,080 6,358,050 47,723,749 202,065,875 + 6,293,400 7,983,540 2,994,599 25,581,925 48,700,415 206,003,757 + 206,040 109,140 407 50,815 48,700,637 206,003,795 + 225,420 142,800 8,679 401,381 48,698,820 206,005,265 + 1,299,480 1,707,480 579,422 6,943,222 48,733,791 206,098,060 + 952,680 1,248,480 360,710 4,799,958 48,840,759 206,648,359 + 1,425,960 1,831,920 738,359 4,983,831 48,892,096 206,834,840 + 1,770,720 2,091,000 1,389,502 7,767,439 49,297,747 209,328,856 + 479,400 727,260 146,129 2,899,286 49,331,055 209,479,362 + 168,300 235,620 47,436 1,385,568 49,333,845 209,503,564 + 134,640 236,640 37,183 1,808,603 49,338,373 209,509,777 + 90,780 122,400 23,924 1,555,868 49,336,559 209,515,352 + 3,088,560 3,953,520 1,404,256 11,037,484 49,933,159 211,878,380 + 4,987,800 6,165,900 2,326,692 17,577,030 50,214,110 212,941,025 + 993,480 1,378,020 304,617 6,594,520 50,293,382 213,254,405 + 684,420 900,660 258,512 4,016,395 50,398,489 213,650,745 ================================ TOTAL ================================ - 96,202,866 96,139,962 58,019,048 166,982,938 835,336,919 3,540,142,226 + 69,589,500 75,657,480 58,019,048 166,982,938 835,336,919 3,540,142,226 ``` Commits mensuels : ``` =============================== SUMMARY =============================== - dna_4k dna_8k diffs nopack targz real - 67,749,414 61,662,329 48,249,466 64,900,653 48,828,605 206,662,692 - 2,396,108 2,454,980 1,495,969 7,407,714 48,900,735 206,964,143 - 1,953,606 2,180,048 797,390 9,856,043 49,326,511 209,515,646 - 10,598,329 12,226,656 4,142,700 28,400,251 50,394,403 213,653,996 - 14,285,731 16,520,326 5,489,832 34,132,686 51,315,648 217,862,957 - 7,761,827 8,683,938 2,262,584 19,233,445 51,941,615 220,756,834 - 10,116,837 12,628,400 2,999,817 28,983,950 52,574,107 223,306,219 - 1,457,911 1,901,545 299,628 8,343,393 52,587,994 223,373,786 - 14,563,753 16,805,176 4,759,088 34,259,652 53,210,823 226,113,059 - 2,313,331 2,886,878 679,794 10,029,012 53,165,063 225,781,616 - 765,371 1,003,047 138,547 4,375,159 53,183,197 225,870,650 - 17,011,965 20,527,210 5,142,691 45,544,733 53,842,821 228,546,001 - 1,415,857 1,831,671 247,526 8,491,133 53,876,401 228,653,615 - 7,445,399 8,214,306 2,333,317 18,119,613 54,605,555 232,014,492 - 13,079,884 15,834,194 3,989,065 37,945,661 55,206,806 234,571,285 - 13,890,556 16,436,758 3,800,775 37,509,079 56,059,067 238,170,923 - 11,523,815 13,696,636 3,030,148 32,387,325 56,716,443 241,420,002 + 4k_export na_8k_export diffs nopack targz real + 47,297,400 47,244,360 48,249,466 64,900,653 48,828,605 206,662,692 + 1,822,740 1,938,000 1,495,969 7,407,714 48,900,735 206,964,143 + 1,525,920 1,808,460 797,390 9,856,043 49,326,511 209,515,646 + 8,047,800 9,840,960 4,142,700 28,400,251 50,394,403 213,653,996 + 10,730,400 13,230,420 5,489,832 34,132,686 51,315,648 217,862,957 + 5,786,460 6,936,000 2,262,584 19,233,445 51,941,615 220,756,834 + 7,816,260 10,320,360 2,999,817 28,983,950 52,574,107 223,306,219 + 1,210,740 1,643,220 299,628 8,343,393 52,587,994 223,373,786 + 11,002,740 13,589,460 4,759,088 34,259,652 53,210,823 226,113,059 + 1,819,680 2,399,040 679,794 10,029,012 53,165,063 225,781,616 + 622,200 858,840 138,547 4,375,159 53,183,197 225,870,650 + 12,874,440 16,493,400 5,142,691 45,544,733 53,842,821 228,546,001 + 1,169,940 1,591,200 247,526 8,491,133 53,876,401 228,653,615 + 5,631,420 6,589,200 2,333,317 18,119,613 54,605,555 232,014,492 + 9,988,860 12,876,480 3,989,065 37,945,661 55,206,806 234,571,285 + 10,659,000 13,416,060 3,800,775 37,509,079 56,059,067 238,170,923 + 8,796,480 11,079,240 3,030,148 32,387,325 56,716,443 241,420,002 ================================ TOTAL ================================ -198,329,694 215,494,098 89,858,337 429,919,502 895,735,794 3,803,237,916 +146,802,480 171,854,700 89,858,337 429,919,502 895,735,794 3,803,237,916 ``` <!-- LTeX: language=en --> diff --git a/exp/Makefile b/exp/Makefile index 734c40b..b7511fd 100644 --- a/exp/Makefile +++ b/exp/Makefile @@ -48,7 +48,8 @@ export GIT_PATH ?= $(abspath git) GITC := git -C $(REPO_PATH) DNADIRS := $(DNA_4K) $(DNA_8K) -DATADIRS := $(DNA_4K) $(DNA_8K) $(DIFFS) $(NOPACK) $(BORG) $(TARGZ) $(REAL) +DNAEXPORT := $(DNADIRS:%=%_export) +DATADIRS := $(DNADIRS) $(DNAEXPORT) $(DIFFS) $(NOPACK) $(BORG) $(TARGZ) $(REAL) SIZEFILES := $(DATADIRS:%=%.size) .PHONY: all exp @@ -76,7 +77,7 @@ $(DNADIRS:%=%.size) $(REAL).size: %.size: %.versions run cut -f1 $$i | paste -sd+ | bc >> $@; \ done -$(BORG).size: $(BORG).versions run +$(BORG).size $(DNAEXPORT:%=%.size): %.size: %.versions run rm -rf $@ prev=0; for i in $</*; do \ last=`cut -f1 $$i`; \ @@ -115,7 +116,7 @@ $(NOPACK).size: $(NOPACK).versions run | sort -k2 \ > $@ -run: $(COMMITS) $(DNA_BACKUP) $(DNA_PARAMS) | printvars $(DATADIRS) $(NOPACK).versions $(BORG).versions $(REAL).versions +run: $(COMMITS) $(DNA_BACKUP) $(DNA_PARAMS) | printvars $(DATADIRS) $(NOPACK).versions $(BORG).versions $(REAL).versions $(DNAEXPORT:%=%.versions) rm -rf $(DATADIRS:%=%/*) $(DATADIRS:%=%.versions/*) ./exp.sh touch $@ @@ -130,7 +131,7 @@ $(DNA_PARAMS): echo "$(DNA_4K) -c 4096" >> $@ echo "$(DNA_8K) -c 8192" >> $@ -$(DATADIRS) $(NOPACK).versions $(BORG).versions $(REAL).versions: +$(DATADIRS) $(NOPACK).versions $(BORG).versions $(REAL).versions $(DNAEXPORT:%=%.versions): mkdir $@ $(DNA_BACKUP): .FORCE @@ -130,6 +130,16 @@ do do log "create $name backup for this version" $DNA_BACKUP commit -v 2 $flags $REPO_PATH $name + + log "create $name export for this version" + export=/tmp/dna-backup-exp-export + rm -rf $export + $DNA_BACKUP export -v 2 $flags $name $export + find $export -type f -exec du -ba {} + \ + | cut -f1 \ + | paste -sd+ \ + | bc \ + > $(printf "%s_export.versions/%05d" $name $i) done fi |