Revendor Cortex #2755
Revendor Cortex #2755
Conversation
There was a problem hiding this comment.
LGTM @sandeepsukhani can you take a look at the delimeter changes? I think we talked about a method on the stores for asking for the delimeter so we don't have to hard code it, not sure where that ended up.
| @@ -61,7 +61,7 @@ func newTable(ctx context.Context, workingDirectory string, objectClient chunk.O | |||
| } | |||
|
|
|||
| func (t *table) compact() error { | |||
| objects, _, err := t.storageClient.List(t.ctx, t.name+"/") | |||
There was a problem hiding this comment.
The forward slash here needs to stay because we are trying to list contents of a directory without it we will get the name of the same directory back with hosted object stores. This is due to the object stores not having a concept of directories.
| @@ -120,7 +121,7 @@ func (t *Table) init(ctx context.Context, spanLogger *spanlogger.SpanLogger) (er | |||
| startTime := time.Now() | |||
| totalFilesSize := int64(0) | |||
|
|
|||
| objects, _, err := t.storageClient.List(ctx, t.name+"/") | |||
There was a problem hiding this comment.
same suggestion here as well.
| @@ -308,7 +309,7 @@ func (t *Table) Sync(ctx context.Context) error { | |||
| func (t *Table) checkStorageForUpdates(ctx context.Context) (toDownload []chunk.StorageObject, toDelete []string, err error) { | |||
| // listing tables from store | |||
| var objects []chunk.StorageObject | |||
| objects, _, err = t.storageClient.List(ctx, t.name+"/") | |||
@slim-bean Cortex team has changed the code to convert delimiter on windows between request/response. We just have to pass paths with "/" always and they have used https://golang.org/pkg/path/filepath/#FromSlash and https://golang.org/pkg/path/filepath/#ToSlash functions which comes from standard go package so we don't have to worry about it. |
* replaces prometheus & revendors cortex * compat * compat * sd refactor * updates docker * removes prom replace * adds delimiters back to object addrs in boltdb Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
In addition to revendoring Cortex, this includes
This update will include cortexproject/cortex#3314 (a fix for the sharded ruler).
/cc @slim-bean @sandeepsukhani