Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: thanos-io/thanos
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4529ed1
Choose a base ref
...
head repository: thanos-io/thanos
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b6d9741
Choose a head ref
  • 10 commits
  • 17 files changed
  • 5 contributors

Commits on Apr 15, 2020

  1. store: proxy: fix queries never timing out bug (#2411) (#2443)

    * store: proxy: add test for deadlocking problem
    
    Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
    
    * store: proxy: add fix for timeouts
    
    Checking here if the series context has ended is the correct fix here.
    We want to check it because if any of the other Series() calls error out
    then the context is canceled. So, it is equal to checking for errors
    "downstream", in `mergedSeriesSet`.
    
    Also, `handleErr()` here is the correct function to use because in such
    a case we want to set `s.err` -- if `io.EOF` still hasn't been received
    then it means that StoreAPI still has some data that it wants to send
    but hasn't yet.
    
    With this, the previously added test passes.
    
    Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
    
    Co-authored-by: Giedrius Statkevičius <giedriuswork@gmail.com>
    squat and GiedriusS authored Apr 15, 2020
    Configuration menu
    Copy the full SHA
    c983b0b View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2020

  1. Added tests to reproduce #2459. (#2462)

    Related to: #2459
    
    Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
    bwplotka authored Apr 20, 2020
    Configuration menu
    Copy the full SHA
    7c5bea6 View commit details
    Browse the repository at this point in the history
  2. pkg/block/fetcher: fix concurrent map usage (#2474)

    Fixes: #2471
    
    This commit fixes an issue where multiple goroutines in the block
    fetcher filtering were concurrently accessing the same map. The
    goroutines were concurrently writing AND reading to the shared metas
    map. This commit guards this concurrent access by giving the
    DeduplicateFilter struct a mutex.
    
    Signed-off-by: Lucas Servén Marín <lserven@gmail.com>
    squat authored Apr 20, 2020
    Configuration menu
    Copy the full SHA
    7250c6b View commit details
    Browse the repository at this point in the history
  3. Reverted addition of deletion mark for partial uploads. (#2472)

    Fixes #2459 (quick fix).
    
    This keeps the logic from the 0.11.0 which was good enough.
    
    Some improvement for future: #2470
    
    Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
    bwplotka authored Apr 20, 2020
    Configuration menu
    Copy the full SHA
    2654a10 View commit details
    Browse the repository at this point in the history
  4. cut v0.12.1 (#2476)

    Signed-off-by: Lucas Servén Marín <lserven@gmail.com>
    squat authored Apr 20, 2020
    Configuration menu
    Copy the full SHA
    6ebdb92 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2020

  1. fix thanos web route prefix register twice (#2489)

    Signed-off-by: yeya24 <yb532204897@gmail.com>
    Signed-off-by: Lucas Servén Marín <lserven@gmail.com>
    
    Co-authored-by: yeya24 <yb532204897@gmail.com>
    squat and yeya24 authored Apr 21, 2020
    Configuration menu
    Copy the full SHA
    60a2c9e View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2020

  1. Merge pull request #2500 from thanos-io/release-0.12

    Merge v0.12.1 into master
    squat authored Apr 22, 2020
    Configuration menu
    Copy the full SHA
    45a6bc4 View commit details
    Browse the repository at this point in the history
  2. Gracefully handle additional oneof fields in SeriesResponse

    Signed-off-by: Marco Pracucci <marco@pracucci.com>
    pracucci committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    80b5422 View commit details
    Browse the repository at this point in the history
  3. Removed unnecessary continue

    Signed-off-by: Marco Pracucci <marco@pracucci.com>
    pracucci committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    cf834e9 View commit details
    Browse the repository at this point in the history
  4. Updated CHANGELOG

    Signed-off-by: Marco Pracucci <marco@pracucci.com>
    pracucci committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    b6d9741 View commit details
    Browse the repository at this point in the history
Loading