@@ -781,8 +781,9 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
781781 // Map the address of the worker to the error message object
782782 tracefileOpenErrorMap[traceFileErrorsItr->first .toString ()] = msgObj;
783783 } catch (Error& e) {
784- if (e.code () == error_code_actor_cancelled)
784+ if (e.code () == error_code_actor_cancelled) {
785785 throw ;
786+ }
786787 incomplete_reasons->insert (" file_open_error details could not be retrieved" );
787788 }
788789 }
@@ -1097,8 +1098,9 @@ ACTOR static Future<JsonBuilderObject> processStatusFetcher(
10971098 }
10981099
10991100 } catch (Error& e) {
1100- if (e.code () == error_code_actor_cancelled)
1101+ if (e.code () == error_code_actor_cancelled) {
11011102 throw ;
1103+ }
11021104 // Something strange occurred, process list is incomplete but what was built so far, if anything, will be
11031105 // returned.
11041106 incomplete_reasons->insert (" Cannot retrieve all process status information." );
@@ -1414,8 +1416,9 @@ ACTOR static Future<JsonBuilderObject> latencyProbeFetcher(Database cx,
14141416
14151417 wait (waitForAll (probes));
14161418 } catch (Error& e) {
1417- if (e.code () == error_code_actor_cancelled)
1419+ if (e.code () == error_code_actor_cancelled) {
14181420 throw ;
1421+ }
14191422 incomplete_reasons->insert (format (" Unable to retrieve latency probe information (%s)." , e.what ()));
14201423 }
14211424
@@ -1455,8 +1458,9 @@ ACTOR static Future<Void> consistencyCheckStatusFetcher(Database cx,
14551458 }
14561459 }
14571460 } catch (Error& e) {
1458- if (e.code () == error_code_actor_cancelled)
1461+ if (e.code () == error_code_actor_cancelled) {
14591462 throw ;
1463+ }
14601464 incomplete_reasons->insert (format (" Unable to retrieve consistency check settings (%s)." , e.what ()));
14611465 }
14621466 return Void ();
@@ -1548,8 +1552,9 @@ ACTOR static Future<Void> logRangeWarningFetcher(Database cx,
15481552 }
15491553 }
15501554 } catch (Error& e) {
1551- if (e.code () == error_code_actor_cancelled)
1555+ if (e.code () == error_code_actor_cancelled) {
15521556 throw ;
1557+ }
15531558 incomplete_reasons->insert (format (" Unable to retrieve log ranges (%s)." , e.what ()));
15541559 }
15551560 return Void ();
@@ -1724,8 +1729,9 @@ static JsonBuilderObject configurationFetcher(Optional<DatabaseConfiguration> co
17241729 int count = coordinators.clientLeaderServers .size ();
17251730 statusObj[" coordinators_count" ] = count;
17261731 } catch (Error& e) {
1727- if (e.code () == error_code_actor_cancelled)
1732+ if (e.code () == error_code_actor_cancelled) {
17281733 throw ;
1734+ }
17291735 incomplete_reasons->insert (" Could not retrieve all configuration status information." );
17301736 }
17311737 return statusObj;
@@ -2747,8 +2753,9 @@ ACTOR Future<JsonBuilderObject> layerStatusFetcher(Database cx,
27472753 }
27482754 } catch (Error& e) {
27492755 TraceEvent (SevWarn, " LayerStatusError" ).error (e);
2750- if (e.code () == error_code_actor_cancelled)
2756+ if (e.code () == error_code_actor_cancelled) {
27512757 throw ;
2758+ }
27522759 incomplete_reasons->insert (format (" Unable to retrieve layer status (%s)." , e.what ()));
27532760 json.create (" _error" ) = format (" Unable to retrieve layer status (%s)." , e.what ());
27542761 json.create (" _valid" ) = false ;
0 commit comments