File tree Expand file tree Collapse file tree 2 files changed +3
-5
lines changed
sled-agent/config-reconciler/src Expand file tree Collapse file tree 2 files changed +3
-5
lines changed Original file line number Diff line number Diff line change @@ -361,7 +361,6 @@ impl DumpSetup {
361361 // log an error and bail out. These error cases should be impossible to
362362 // hit in practice.
363363 let Some ( file_name) = zone_root. file_name ( ) else {
364- // This should be impossible. We're never
365364 error ! (
366365 log,
367366 "cannot archive former zone root" ;
@@ -393,7 +392,6 @@ impl DumpSetup {
393392 "failed to request archive of former zone root" ;
394393 "error" => "DumpSetup channel closed"
395394 ) ;
396- return ;
397395 }
398396 }
399397}
@@ -1128,8 +1126,8 @@ impl DumpSetupWorker {
11281126 . await ;
11291127 if let Err ( ( ) ) = completion_tx. send ( ( ) ) {
11301128 // This is very surprising unless the runtime is shutting down, as
1131- // in the test suite. Anyway, it's not a failure to archive the
1132- // logs.
1129+ // could happen in the test suite. Anyway, it's not a failure to
1130+ // archive the logs.
11331131 warn ! (
11341132 self . log,
11351133 "Failed to report completion of former zone root archival" ;
Original file line number Diff line number Diff line change @@ -710,7 +710,7 @@ impl OmicronZone {
710710 ) ) ;
711711 }
712712
713- // Make a best effort to archive the zone.
713+ // Make a best effort to archive the zone's log files .
714714 if let Some ( zone_dataset_root) = running_zone. root ( ) . parent ( ) {
715715 zone_facilities
716716 . archive_zone_root ( zone_dataset_root. to_owned ( ) )
You can’t perform that action at this time.
0 commit comments