Skip to content
Permalink
Browse files

Merge pull request #167 from bareos/dev/arogge/master/fix-1030

Fix #1030: bscan does not work for migration and copy jobs
  • Loading branch information...
arogge committed Apr 10, 2019
2 parents cfc97d3 + 1e9af0f commit 0af8e5defbd83c2cbce6044dc8e197e230a7c632
Showing with 3,154 additions and 203 deletions.
  1. +0 −2 core/src/stored/bscan.cc
  2. +10 −11 core/src/stored/mac.cc
  3. +6 −0 systemtests/CMakeLists.txt
  4. +3 −0 systemtests/environment.in
  5. +188 −190 systemtests/scripts/functions
  6. +8 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
  7. +7 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
  8. +7 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in
  9. +27 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
  10. +11 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/fileset/Catalog.conf
  11. +11 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
  12. +31 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/fileset/LinuxAll.conf
  13. +31 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/fileset/LinuxAll.conf.in
  14. +11 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/fileset/SelfTest.conf
  15. +11 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
  16. +17 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/fileset/Windows All Drives.conf
  17. +21 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in
  18. +11 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
  19. +5 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in
  20. +16 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
  21. +9 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
  22. +11 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/messages/Standard.conf.in
  23. +10 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/pool/Differential.conf
  24. +10 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/pool/Full.conf
  25. +10 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/pool/Incremental.conf
  26. +4 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/pool/Scratch.conf
  27. +18 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/profile/operator.conf
  28. +6 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/schedule/WeeklyCycle.conf
  29. +5 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf
  30. +8 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-dir.d/storage/File.conf.in
  31. +20 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-fd.d/client/myself.conf.in
  32. +5 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
  33. +6 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-fd.d/director/bareos-mon.conf.in
  34. +5 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-fd.d/messages/Standard.conf
  35. +11 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-sd.d/device/FileStorage.conf.in
  36. +5 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
  37. +6 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-sd.d/director/bareos-mon.conf.in
  38. +5 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-sd.d/messages/Standard.conf
  39. +14 −0 systemtests/tests/backup-bscan/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
  40. +10 −0 systemtests/tests/backup-bscan/etc/bareos/bconsole.conf.in
  41. +5 −0 systemtests/tests/backup-bscan/etc/bareos/tray-monitor.d/client/FileDaemon-local.conf.in
  42. +4 −0 systemtests/tests/backup-bscan/etc/bareos/tray-monitor.d/director/Director-local.conf.in
  43. +7 −0 systemtests/tests/backup-bscan/etc/bareos/tray-monitor.d/monitor/bareos-mon.conf.in
  44. +5 −0 systemtests/tests/backup-bscan/etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf.in
  45. +113 −0 systemtests/tests/backup-bscan/testrunner
  46. +8 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
  47. +7 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
  48. +7 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in
  49. +27 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
  50. +11 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/fileset/Catalog.conf
  51. +11 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
  52. +31 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/fileset/LinuxAll.conf
  53. +31 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/fileset/LinuxAll.conf.in
  54. +11 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/fileset/SelfTest.conf
  55. +11 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
  56. +17 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/fileset/Windows All Drives.conf
  57. +21 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in
  58. +11 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
  59. +5 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in
  60. +9 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/job/copy.conf
  61. +16 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
  62. +9 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
  63. +11 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/messages/Standard.conf.in
  64. +10 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/pool/Differential.conf
  65. +11 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/pool/Full.conf
  66. +11 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/pool/FullCopy.conf
  67. +10 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/pool/Incremental.conf
  68. +4 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/pool/Scratch.conf
  69. +18 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/profile/operator.conf
  70. +6 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/schedule/WeeklyCycle.conf
  71. +5 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf
  72. +17 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-dir.d/storage/File.conf.in
  73. +20 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-fd.d/client/myself.conf.in
  74. +5 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
  75. +6 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-fd.d/director/bareos-mon.conf.in
  76. +5 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-fd.d/messages/Standard.conf
  77. +22 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-sd.d/device/FileStorage.conf.in
  78. +5 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
  79. +6 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-sd.d/director/bareos-mon.conf.in
  80. +5 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-sd.d/messages/Standard.conf
  81. +14 −0 systemtests/tests/copy-bscan/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
  82. +10 −0 systemtests/tests/copy-bscan/etc/bareos/bconsole.conf.in
  83. +5 −0 systemtests/tests/copy-bscan/etc/bareos/tray-monitor.d/client/FileDaemon-local.conf.in
  84. +4 −0 systemtests/tests/copy-bscan/etc/bareos/tray-monitor.d/director/Director-local.conf.in
  85. +7 −0 systemtests/tests/copy-bscan/etc/bareos/tray-monitor.d/monitor/bareos-mon.conf.in
  86. +5 −0 systemtests/tests/copy-bscan/etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf.in
  87. +133 −0 systemtests/tests/copy-bscan/testrunner
  88. +22 −0 systemtests/tests/copy-remote-bscan/etc/bareos-remote/bareos-sd.d/device/FileStorage.conf.in
  89. +5 −0 systemtests/tests/copy-remote-bscan/etc/bareos-remote/bareos-sd.d/director/bareos-dir.conf.in
  90. +6 −0 systemtests/tests/copy-remote-bscan/etc/bareos-remote/bareos-sd.d/director/bareos-mon.conf.in
  91. +5 −0 systemtests/tests/copy-remote-bscan/etc/bareos-remote/bareos-sd.d/messages/Standard.conf
  92. +14 −0 systemtests/tests/copy-remote-bscan/etc/bareos-remote/bareos-sd.d/storage/bareos-sd.conf.in
  93. +8 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
  94. +7 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
  95. +7 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in
  96. +27 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
  97. +11 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/fileset/Catalog.conf
  98. +11 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
  99. +31 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/fileset/LinuxAll.conf
  100. +31 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/fileset/LinuxAll.conf.in
  101. +11 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/fileset/SelfTest.conf
  102. +11 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
  103. +17 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/fileset/Windows All Drives.conf
  104. +21 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in
  105. +11 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
  106. +5 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in
  107. +9 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/job/copy.conf
  108. +16 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
  109. +9 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
  110. +11 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/messages/Standard.conf.in
  111. +9 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/pool/Differential.conf
  112. +10 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/pool/Full.conf
  113. +10 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/pool/FullCopy.conf
  114. +9 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/pool/Incremental.conf
  115. +4 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/pool/Scratch.conf
  116. +18 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/profile/operator.conf
  117. +6 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/schedule/WeeklyCycle.conf
  118. +5 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf
  119. +17 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/storage/File.conf.in
  120. +17 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/storage/RemoteFile.conf.in
  121. +20 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-fd.d/client/myself.conf.in
  122. +5 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
  123. +6 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-fd.d/director/bareos-mon.conf.in
  124. +5 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-fd.d/messages/Standard.conf
  125. +22 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-sd.d/device/FileStorage.conf.in
  126. +5 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
  127. +6 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-sd.d/director/bareos-mon.conf.in
  128. +5 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-sd.d/messages/Standard.conf
  129. +14 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
  130. +10 −0 systemtests/tests/copy-remote-bscan/etc/bareos/bconsole.conf.in
  131. +5 −0 systemtests/tests/copy-remote-bscan/etc/bareos/tray-monitor.d/client/FileDaemon-local.conf.in
  132. +4 −0 systemtests/tests/copy-remote-bscan/etc/bareos/tray-monitor.d/director/Director-local.conf.in
  133. +7 −0 systemtests/tests/copy-remote-bscan/etc/bareos/tray-monitor.d/monitor/bareos-mon.conf.in
  134. +5 −0 systemtests/tests/copy-remote-bscan/etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf.in
  135. +149 −0 systemtests/tests/copy-remote-bscan/testrunner
  136. +8 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
  137. +7 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
  138. +7 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in
  139. +27 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
  140. +11 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/fileset/Catalog.conf
  141. +11 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
  142. +31 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/fileset/LinuxAll.conf
  143. +31 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/fileset/LinuxAll.conf.in
  144. +11 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/fileset/SelfTest.conf
  145. +11 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
  146. +17 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/fileset/Windows All Drives.conf
  147. +21 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in
  148. +11 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
  149. +6 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in
  150. +16 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
  151. +9 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
  152. +11 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/messages/Standard.conf.in
  153. +10 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/pool/Differential.conf
  154. +11 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/pool/Full.conf
  155. +11 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/pool/Incremental.conf
  156. +4 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/pool/Scratch.conf
  157. +11 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/pool/VirtualFull.conf
  158. +18 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/profile/operator.conf
  159. +6 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/schedule/WeeklyCycle.conf
  160. +5 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf
  161. +17 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-dir.d/storage/File.conf.in
  162. +20 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-fd.d/client/myself.conf.in
  163. +5 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
  164. +6 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-fd.d/director/bareos-mon.conf.in
  165. +5 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-fd.d/messages/Standard.conf
  166. +22 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-sd.d/device/FileStorage.conf.in
  167. +5 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
  168. +6 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-sd.d/director/bareos-mon.conf.in
  169. +5 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-sd.d/messages/Standard.conf
  170. +14 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
  171. +10 −0 systemtests/tests/virtualfull-bscan/etc/bareos/bconsole.conf.in
  172. +5 −0 systemtests/tests/virtualfull-bscan/etc/bareos/tray-monitor.d/client/FileDaemon-local.conf.in
  173. +4 −0 systemtests/tests/virtualfull-bscan/etc/bareos/tray-monitor.d/director/Director-local.conf.in
  174. +7 −0 systemtests/tests/virtualfull-bscan/etc/bareos/tray-monitor.d/monitor/bareos-mon.conf.in
  175. +5 −0 systemtests/tests/virtualfull-bscan/etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf.in
  176. +134 −0 systemtests/tests/virtualfull-bscan/testrunner
  177. +8 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
  178. +7 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
  179. +7 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in
  180. +27 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
  181. +11 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/fileset/Catalog.conf
  182. +11 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
  183. +31 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/fileset/LinuxAll.conf
  184. +31 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/fileset/LinuxAll.conf.in
  185. +11 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/fileset/SelfTest.conf
  186. +11 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
  187. +17 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/fileset/Windows All Drives.conf
  188. +21 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in
  189. +11 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
  190. +6 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in
  191. +16 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
  192. +9 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
  193. +11 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/messages/Standard.conf.in
  194. +10 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/pool/Differential.conf
  195. +11 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/pool/Full.conf
  196. +11 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/pool/Incremental.conf
  197. +4 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/pool/Scratch.conf
  198. +11 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/pool/VirtualFull.conf
  199. +18 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/profile/operator.conf
  200. +6 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/schedule/WeeklyCycle.conf
  201. +5 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf
  202. +17 −0 systemtests/tests/virtualfull/etc/bareos/bareos-dir.d/storage/File.conf.in
  203. +20 −0 systemtests/tests/virtualfull/etc/bareos/bareos-fd.d/client/myself.conf.in
  204. +5 −0 systemtests/tests/virtualfull/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
  205. +6 −0 systemtests/tests/virtualfull/etc/bareos/bareos-fd.d/director/bareos-mon.conf.in
  206. +5 −0 systemtests/tests/virtualfull/etc/bareos/bareos-fd.d/messages/Standard.conf
  207. +22 −0 systemtests/tests/virtualfull/etc/bareos/bareos-sd.d/device/FileStorage.conf.in
  208. +5 −0 systemtests/tests/virtualfull/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
  209. +6 −0 systemtests/tests/virtualfull/etc/bareos/bareos-sd.d/director/bareos-mon.conf.in
  210. +5 −0 systemtests/tests/virtualfull/etc/bareos/bareos-sd.d/messages/Standard.conf
  211. +14 −0 systemtests/tests/virtualfull/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
  212. +10 −0 systemtests/tests/virtualfull/etc/bareos/bconsole.conf.in
  213. +5 −0 systemtests/tests/virtualfull/etc/bareos/tray-monitor.d/client/FileDaemon-local.conf.in
  214. +4 −0 systemtests/tests/virtualfull/etc/bareos/tray-monitor.d/director/Director-local.conf.in
  215. +7 −0 systemtests/tests/virtualfull/etc/bareos/tray-monitor.d/monitor/bareos-mon.conf.in
  216. +5 −0 systemtests/tests/virtualfull/etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf.in
  217. +83 −0 systemtests/tests/virtualfull/testrunner
@@ -794,8 +794,6 @@ static bool RecordCb(DeviceControlRecord* dcr, DeviceRecord* rec)
Pmsg1(0, _("Could not update job record. ERR=%s\n"),
db->strerror());
}
mjcr->read_dcr = NULL;
FreeJcr(mjcr);
}
}
mr.VolFiles = rec->File;
@@ -146,13 +146,16 @@ static bool CloneRecordInternally(DeviceControlRecord* dcr, DeviceRecord* rec)

UnserSessionLabel(label, rec);

/*
* set job info from first SOS label
*/
if (jcr->is_JobType(JT_MIGRATE) || jcr->is_JobType(JT_COPY)) {
bstrncpy(jcr->Job, label->Job, sizeof(jcr->Job));
PmStrcpy(jcr->job_name, label->JobName);
PmStrcpy(jcr->client_name, label->ClientName);
PmStrcpy(jcr->fileset_name, label->FileSetName);
PmStrcpy(jcr->fileset_md5, label->FileSetMD5);
}
jcr->setJobType(label->JobType);
jcr->setJobLevel(label->JobLevel);
Dmsg1(200, "joblevel from SOS_LABEL is now %c\n", label->JobLevel);
bstrncpy(jcr->Job, label->Job, sizeof(jcr->Job));

if (label->VerNum >= 11) {
jcr->sched_time = BtimeToUnix(label->write_btime);
@@ -176,15 +179,11 @@ static bool CloneRecordInternally(DeviceControlRecord* dcr, DeviceRecord* rec)
}
} else {
Dmsg0(200, "Found additional SOS_LABEL, ignoring! \n");
retval = true;
goto bail_out;
}

} else {
/* Other label than SOS -> skip */
retval = true;
goto bail_out;
}
/* Other label than SOS -> skip */
retval = true;
goto bail_out;
}

/*
@@ -163,6 +163,11 @@ set(SYSTEM_TESTS
backup-bareos-test
backup-bareos-passive-test
multiplied-device-test
virtualfull
virtualfull-bscan
backup-bscan
copy-bscan
copy-remote-bscan
)

set(BASEPORT 42001)
@@ -191,6 +196,7 @@ foreach(TEST_NAME ${SYSTEM_TESTS})
math(EXPR dir_port "${BASEPORT} + 0")
math(EXPR fd_port "${BASEPORT} + 1")
math(EXPR sd_port "${BASEPORT} + 2")
math(EXPR sd2_port "${BASEPORT} + 3")


# set(DEFAULT_DB_TYPE )
@@ -5,6 +5,7 @@ db_password="@db_password@"

PROJECT_BINARY_DIR=@PROJECT_BINARY_DIR@
bin=${PROJECT_BINARY_DIR}/bin
sbin=${PROJECT_BINARY_DIR}/sbin

current_test_directory=${PROJECT_BINARY_DIR}/tests/@TEST_NAME@

@@ -19,6 +20,7 @@ tmp=${current_test_directory}/tmp


dumps=${current_test_directory}/dumps
backenddir=@backenddir@
plugindir=${PROJECT_BINARY_DIR}/plugins
plugindirtmp=${PROJECT_BINARY_DIR}/pluginstmp
rscripts=${PROJECT_BINARY_DIR}/scripts
@@ -39,6 +41,7 @@ export BAREOS_WORKING_DIR=${working}
export BASEPORT=@BASEPORT@
export BAREOS_DIRECTOR_PORT=@dir_port@
export BAREOS_STORAGE_PORT=@sd_port@
export BAREOS_STORAGE2_PORT=@sd2_port@
export BAREOS_FD_PORT=@fd_port@
export PIDDIR=@piddir@

Oops, something went wrong.

0 comments on commit 0af8e5d

Please sign in to comment.
You can’t perform that action at this time.