Fix for the controller panic issue on metrics.enabled is false#486
Merged
markmandel merged 1 commit intoagones-dev:masterfrom Jan 17, 2019
Merged
Fix for the controller panic issue on metrics.enabled is false#486markmandel merged 1 commit intoagones-dev:masterfrom
markmandel merged 1 commit intoagones-dev:masterfrom
Conversation
Collaborator
|
Build Failed 😱 Build Id: 88873928-136c-46d3-9beb-d0b67ece13de Build Logs |
Collaborator
|
Build Succeeded 👏 Build Id: b88e0386-0bcb-4e0d-834b-802ef91c6538 The following development artifacts have been built, and will exist for the next 30 days:
To install this version:
|
Collaborator
|
Rather than use all this reflect (and generally we shouldn't need to) - and to avoid this messiness, why don't we try something more like this, where we dynamically append to WDYT? server := &httpServer{}
var rs []runner
var health healthcheck.Handler
if ctlConf.Metrics {
registry := prom.NewRegistry()
metricHandler, err := metrics.RegisterPrometheusExporter(registry)
if err != nil {
logger.WithError(err).Fatal("Could not create register prometheus exporter")
}
server.Handle("/metrics", metricHandler)
health = healthcheck.NewMetricsHandler(registry, "agones")
rs = append(rs, metrics.NewController(kubeClient, agonesClient, agonesInformerFactory))
} else {
health = healthcheck.NewHandler()
}
server.Handle("/", health)
allocationMutex := &sync.Mutex{}
gsController := gameservers.NewController(wh, health, allocationMutex,
ctlConf.MinPort, ctlConf.MaxPort, ctlConf.SidecarImage, ctlConf.AlwaysPullSidecar,
ctlConf.SidecarCPURequest, ctlConf.SidecarCPULimit,
kubeClient, kubeInformationFactory, extClient, agonesClient, agonesInformerFactory)
gsSetController := gameserversets.NewController(wh, health, allocationMutex,
kubeClient, extClient, agonesClient, agonesInformerFactory)
fleetController := fleets.NewController(wh, health, kubeClient, extClient, agonesClient, agonesInformerFactory)
faController := fleetallocation.NewController(wh, allocationMutex,
kubeClient, extClient, agonesClient, agonesInformerFactory)
gasController := gameserverallocations.NewController(wh, health, allocationMutex, kubeClient,
kubeInformationFactory, extClient, agonesClient, agonesInformerFactory)
fasController := fleetautoscalers.NewController(wh, health,
kubeClient, extClient, agonesClient, agonesInformerFactory)
rs = append(rs, wh, gsController, gsSetController, fleetController, faController, fasController, gasController, server)
stop := signals.NewStopChannel()
kubeInformationFactory.Start(stop)
agonesInformerFactory.Start(stop)
for _, r := range rs {
go func(rr runner) {
if runErr := rr.Run(workers, stop); runErr != nil {
logger.WithError(runErr).Fatalf("could not start runner: %s", reflect.TypeOf(rr))
}
}(r)
} |
Collaborator
|
I think it's a great idea ! |
markmandel
requested changes
Jan 16, 2019
Collaborator
markmandel
left a comment
markmandel
left a comment
There was a problem hiding this comment.
Then let's change this PR to do this then 😄
Force us to clean this section up.
If we disable metrics in Helm config file, Agones controller will panic on rr.Run() which could not be executed on non-nil interface with nil value (and not empty type of metrics.Controller).
Collaborator
|
Build Succeeded 👏 Build Id: 7d79a0f1-5675-4a72-9612-23bb0587be53 The following development artifacts have been built, and will exist for the next 30 days:
To install this version:
|
markmandel
added
kind/bug
markmandel
approved these changes
Jan 17, 2019
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
If we disable metrics in Helm config file, Agones controller will panic on Run() call which could not be executed on non-nil interface with nil value (and not empty type of metrics.Controller).