Split up the single Cortex binary into cortex-{distributor, ingester, querier, ruler, table-manager} by tomwilkie · Pull Request #218 · cortexproject/cortex

tomwilkie · 2017-01-18T19:58:36Z

Fixes #194, fixes #151

Push flag definitions onto the respective config objects
Separate binaries for each component
Add a new component: cortex_querier (currently a dressed up distributor)
New server package for common server logic
Makefile magic to decide what services to build
Nest the consul client in the ring, and the ring in the ingester registerer, as they share config.
Make the chunk cache initialise itself, and noop if isn't provided a hostname
Move prometheus.MustRegister into each component to reduce repetition

juliusv · 2017-01-22T21:04:55Z

cmd/cortex-ingester/main.go

need -> needs

juliusv · 2017-01-22T21:07:22Z

cmd/cortex-ingester/main.go

The var serverConfig = server.Config{} style here and below is just a bit unusual. More usual would be either var serverConfig server.Config or serverConfig := server.Config{} (not a mix of var and explicit assignment of zero value).

Fair point, I'll make it this:

var ( serverConfig server.Config ... )

juliusv · 2017-01-22T21:26:16Z

util/flags.go

think -> thing

juliusv · 2017-01-22T21:28:47Z

👍

juliusv · 2017-01-22T21:33:54Z

Btw., do we need the cortex- prefix in the binary dirs? Since it's all part of Cortex, it seems a bit redundant.

tomwilkie · 2017-01-23T10:29:23Z

Btw., do we need the cortex- prefix in the binary dirs? Since it's all part of Cortex, it seems a bit redundant.

I'm using it to generate the binary and image name, and image name definitely needs it. I can include that as a constant in the Makefile though. Let me give that a go.

juliusv · 2017-01-23T12:31:36Z

👍

- Push flag definitions onto the respective config objects - Separate binaries for each component - Add a new component: cortex_querier (currently a dressed up distributor) - New server package for common server logic - Makefile magic to decide what services to build - Nest the consul client in the ring, and the ring in the ingester registerer, as they share config. - Move prometheus.MustRegister into each component to reduce repetition - Remove ingester http interface - Move ring prometheus metrics to package-level, so we can instantiate the IngesterRegistration more than once.

tomwilkie · 2017-01-23T19:00:20Z

@juliusv @jml I think this is ready to merge now; will do so tomorrow morning unless I hear otherwise?

jml · 2017-01-24T09:40:59Z

Great stuff.

In person yesterday, you mentioned a pattern for constructors for components. Could you please jot that down in text somewhere in the repo?

jml · 2017-01-24T09:59:45Z

I'll take that as a no.

juliusv · 2017-02-01T23:26:16Z

ingester/ingester.go

 			Help: "The total number of samples returned from queries.",
 		}),
 	}
+	prometheus.MustRegister(i)


@tomwilkie Registering Prometheus metrics from a constructor is problematic because it makes it impossible to instantiate multiple objects of the same type (the Prometheus client library will panic). I'm hitting this with ingester tests right now. While there's a non-panicking Register method, neither returning its error nor letting it silently fail seem like the right choice.

I would propose either moving this out of the constructor again or making the metrics global. Which one do you prefer?

I'm hitting this with ingester tests right now

Have you written some new tests? Wondering why I didn't hit it.

I would propose either moving this out of the constructor again or making the metrics global. Which one do you prefer?

Global please. For consistency sake, I'd like everything to be global - I'm not concerned about the namespace pollution, and going global results in less code, which is one of the things I care most about.

Have you written some new tests? Wondering why I didn't hit it.

Yeah, I hit this when writing a second ingester test for the series limiting.

Global please.

Ok, will get to it next week.

FWIW, with having metrics globally, the concern is less about global variable namespace pollution, but about anyone wanting to reuse a package getting globally registered metrics forced on them. As long as we don't care about reuse, that's fine.

tomwilkie self-assigned this Jan 18, 2017

tomwilkie force-pushed the 151-split-it-up branch 4 times, most recently from c22f249 to 327cd5a Compare January 19, 2017 18:56

tomwilkie changed the title ~~[WIP] Spit up the single Cortex binary into cortex_{distributor, ingester, querier, ruler, table_manager}~~ [WIP] Spit up the single Cortex binary into cortex-{distributor, ingester, querier, ruler, table-manager} Jan 19, 2017

tomwilkie force-pushed the 151-split-it-up branch 5 times, most recently from bfc04dd to 176bc38 Compare January 20, 2017 17:54

tomwilkie changed the title ~~[WIP] Spit up the single Cortex binary into cortex-{distributor, ingester, querier, ruler, table-manager}~~ Split up the single Cortex binary into cortex-{distributor, ingester, querier, ruler, table-manager} Jan 20, 2017

tomwilkie force-pushed the 151-split-it-up branch from c85b754 to c8e6d2c Compare January 21, 2017 09:43

tomwilkie mentioned this pull request Jan 22, 2017

Add authfe support for separate cortex query service weaveworks/service#1074

Merged

juliusv reviewed Jan 22, 2017

View reviewed changes

cmd/cortex-ingester/main.go Outdated

Copy link

Contributor

juliusv Jan 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need -> needs

juliusv reviewed Jan 22, 2017

View reviewed changes

util/flags.go Outdated

Copy link

Contributor

juliusv Jan 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

think -> thing

tomwilkie mentioned this pull request Jan 23, 2017

Remove code to migrate from json to proto ring. #225

Merged

tomwilkie force-pushed the 151-split-it-up branch from ae0e822 to 82e7dfe Compare January 23, 2017 18:58

tomwilkie merged commit 2be2a2e into master Jan 24, 2017

tomwilkie deleted the 151-split-it-up branch January 24, 2017 09:55

juliusv reviewed Feb 1, 2017

View reviewed changes

Conversation

tomwilkie commented Jan 18, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

juliusv Jan 22, 2017

Choose a reason for hiding this comment

Uh oh!

juliusv Jan 22, 2017

Choose a reason for hiding this comment

Uh oh!

tomwilkie Jan 22, 2017

Choose a reason for hiding this comment

Uh oh!

juliusv Jan 22, 2017

Choose a reason for hiding this comment

Uh oh!

juliusv commented Jan 22, 2017

Uh oh!

juliusv commented Jan 22, 2017

Uh oh!

tomwilkie commented Jan 23, 2017

Uh oh!

juliusv commented Jan 23, 2017

Uh oh!

tomwilkie commented Jan 23, 2017

Uh oh!

jml commented Jan 24, 2017

Uh oh!

jml commented Jan 24, 2017

Uh oh!

juliusv Feb 1, 2017

Choose a reason for hiding this comment

Uh oh!

tomwilkie Feb 2, 2017

Choose a reason for hiding this comment

Uh oh!

juliusv Feb 3, 2017

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

tomwilkie commented Jan 18, 2017 •

edited

Loading