MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 06:05:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

profiler: Fix how we generate profiles. (#2596)

Browse Source 
Fixes #2594
This commit is contained in:
Harshavardhana 2016-09-01 03:50:31 -07:00 committed by GitHub
parent 790ad68d4d
commit 511a8cbe04
3 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/main.go
View File

@ -140,6 +140,11 @@ func checkMainSyntax(c *cli.Context) {
} }
} }
// Global profiler to be cleanly set and saved inside graceful shutdown.
var globalProfiler interface {
Stop()
}
// Main - main for minio server. // Main - main for minio server.
func Main() { func Main() {
app := registerApp() app := registerApp()
@ -181,11 +186,11 @@ func Main() {
// Enable profiler if ``MINIO_PROFILER`` is set. Supported options are [cpu, mem, block]. // Enable profiler if ``MINIO_PROFILER`` is set. Supported options are [cpu, mem, block].
switch os.Getenv("MINIO_PROFILER") { switch os.Getenv("MINIO_PROFILER") {
case "cpu": case "cpu":
defer profile.Start(profile.CPUProfile, profile.ProfilePath(profileDir)).Stop() globalProfiler = profile.Start(profile.CPUProfile, profile.ProfilePath(profileDir))
case "mem": case "mem":
defer profile.Start(profile.MemProfile, profile.ProfilePath(profileDir)).Stop() globalProfiler = profile.Start(profile.MemProfile, profile.ProfilePath(profileDir))
case "block": case "block":
defer profile.Start(profile.BlockProfile, profile.ProfilePath(profileDir)).Stop() globalProfiler = profile.Start(profile.BlockProfile, profile.ProfilePath(profileDir))
} }
// Run the app - exit on error. // Run the app - exit on error.

10
cmd/utils.go
View File

@ -201,8 +201,18 @@ func startMonitorShutdownSignal(onExitFn onExitFunc) error {
if err != nil { if err != nil {
errorIf(errors.New("Unable to reboot."), err.Error()) errorIf(errors.New("Unable to reboot."), err.Error())
} }
// Successfully forked.
onExitFn(int(exitSuccess)) onExitFn(int(exitSuccess))
} }
// Enable profiler if ``MINIO_PROFILER`` is set.
switch os.Getenv("MINIO_PROFILER") {
case "cpu", "mem", "block":
// Stop any running profiler.
globalProfiler.Stop()
}
// Exit as success if no errors.
onExitFn(int(exitSuccess)) onExitFn(int(exitSuccess))
} }
} }

16
main.go
View File

@ -1,3 +1,19 @@
/*
* Minio Cloud Storage, (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package main package main
import minio "github.com/minio/minio/cmd" import minio "github.com/minio/minio/cmd"