Skip to content

Commit

Permalink
Merge pull request #2198 from graphite-project/DZ-merge-fix
Browse files Browse the repository at this point in the history
Do not try merge series with different length
  • Loading branch information
deniszh committed Jan 11, 2018
2 parents d483c17 + 440195e commit 675280d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion webapp/graphite/render/datalib.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def _merge_results(pathExpr, startTime, endTime, prefetched, seriesList, request
series_best_nones[known.name] = known_nones

if known_nones > candidate_nones and len(series):
if settings.REMOTE_STORE_MERGE_RESULTS:
if settings.REMOTE_STORE_MERGE_RESULTS and len(series) == len(known):
# This series has potential data that might be missing from
# earlier series. Attempt to merge in useful data and update
# the cache count.
Expand Down

0 comments on commit 675280d

Please sign in to comment.