Skip to content

Commit

Permalink
dcache-frontend: remove retry flag on sendAndWait to history service
Browse files Browse the repository at this point in the history
Motivation:

When frontend is run in a core domain and there is
no history service reachable, the retry on no route
to cell ends up spamming the message queues.

Modification:

Since the collector sweeps periodically, it
will automatically detect if the cell is available
at the next pass.   So the RETRY_ON_NO_ROUTE_TO_CELL
flag is unnecessary, and is removed.

Result:

No proliferation of messages.

Target: master
Request: 6.1
Request: 6.0
Request: 5.2
Request: 5.1
Request: 5.0
Patch: https://rb.dcache.org/r/12322/
Requires-book: no
Requires-notes: yes
Acked-by: Dmitry
Acked-by: Lea
  • Loading branch information
alrossi authored and mksahakyan committed Apr 20, 2020
1 parent bd99bf4 commit d6cb494
Showing 1 changed file with 2 additions and 6 deletions.
Expand Up @@ -91,8 +91,6 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
import org.dcache.vehicles.histograms.PoolTimeseriesRequestMessage;
import org.dcache.vehicles.histograms.PoolTimeseriesRequestMessage.TimeseriesType;

import static dmg.cells.nucleus.CellEndpoint.SendFlag.RETRY_ON_NO_ROUTE_TO_CELL;

/**
* <p>Called during the collection gathering in order to obtain
* historical (i.e., stateful) pool data such as queue/mover timeseries
Expand Down Expand Up @@ -159,8 +157,7 @@ public CountingHistogram getAggregateFileLifetime(String poolGroup,

try {
message = historyService.sendAndWait(message,
historyService.getTimeoutInMillis(),
RETRY_ON_NO_ROUTE_TO_CELL);
historyService.getTimeoutInMillis());
} catch (NoRouteToCellException | InterruptedException | TimeoutCacheException e) {
LOGGER.debug("Could not fetch aggregated lifetime data for {}: {}.",
poolGroup, e.getMessage());
Expand Down Expand Up @@ -199,8 +196,7 @@ public Map<TimeseriesType, TimeseriesHistogram> getTimeseries(String pool,
message.setPool(pool);
message.setKeys(types);
message = historyService.sendAndWait(message,
historyService.getTimeoutInMillis(),
RETRY_ON_NO_ROUTE_TO_CELL);
historyService.getTimeoutInMillis());
return message.getHistogramMap();
}

Expand Down

0 comments on commit d6cb494

Please sign in to comment.