Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move to Go 1.6.2 #6534

Merged
merged 1 commit into from
May 3, 2016
Merged

Move to Go 1.6.2 #6534

merged 1 commit into from
May 3, 2016

Conversation

rossmcdonald
Copy link
Contributor

@rossmcdonald rossmcdonald commented May 2, 2016

Required for all non-trivial PRs
  • Rebased/mergable
  • Tests pass
  • CHANGELOG.md updated
  • Sign CLA (if not already signed)

Fixes #6511

@mention-bot
Copy link

By analyzing the blame information on this pull request, we identified @e-dard and @mark-rushakoff to be potential reviewers

@jwilder jwilder added this to the 0.13.0 milestone May 2, 2016
@jwilder
Copy link
Contributor

jwilder commented May 2, 2016

@jwilder
Copy link
Contributor

jwilder commented May 2, 2016

Needs a CHANGELOG entry as well.

@corylanou
Copy link
Contributor

There are several instances of GOMAXPROCS being set that can now be removed. On master I see these lines:

$ Ack GOMAXPROCS

cmd/influx_tsm/main.go
70:     fs.BoolVar(&opts.Parallel, "parallel", false, "Perform parallel conversion. (up to GOMAXPROCS shards at once)")
161:            if !isEnvSet("GOMAXPROCS") {
162:                    // Only modify GOMAXPROCS if it wasn't set in the environment
163:                    // This means 'GOMAXPROCS=1 influx_tsm -parallel' will not actually
165:                    runtime.GOMAXPROCS(runtime.NumCPU())
183:    fmt.Printf("Parallel mode enabled (GOMAXPROCS): %s (%d)\n", yesno(opts.Parallel), runtime.GOMAXPROCS(0))

cmd/influx_tsm/README.md
51:Parallel mode enabled (GOMAXPROCS): yes (8)

cmd/influx_tsm/tracker.go
31:             pg:     NewParallelGroup(runtime.GOMAXPROCS(0)),

cmd/influxd/run/command.go
74:     runtime.GOMAXPROCS(runtime.NumCPU())
79:     log.Printf("Go version %s, GOMAXPROCS set to %d", runtime.Version(), runtime.GOMAXPROCS(0))

monitor/go_runtime.go
16:             "GOMAXPROCS": runtime.GOMAXPROCS(-1),

Monitor seems like we want that one (or someone put thought into that I guess). Not sure about influx_tsm, but influxd should get changed.

@jwilder
Copy link
Contributor

jwilder commented May 2, 2016

@corylanou influx_tsm one should stay as well.

@rossmcdonald rossmcdonald force-pushed the ross-gh6511 branch 2 times, most recently from 744fd47 to 3e03c6e Compare May 2, 2016 19:08
@rossmcdonald
Copy link
Contributor Author

CHANGELOG updated.

@jwilder Regarding package.sh, that script is no longer used for any of our builds in lieu of build.py. I'm wondering if we should just remove it altogether?

@jwilder
Copy link
Contributor

jwilder commented May 2, 2016

I'm not really familiar with it. If you're positive it's not used anywhere then we should remove.

@jwilder
Copy link
Contributor

jwilder commented May 2, 2016

👍 on green.

@rossmcdonald
Copy link
Contributor Author

@jwilder Should we still remove the GOMAXPROCS references? Or should we just keep them there for now?

@jwilder
Copy link
Contributor

jwilder commented May 2, 2016

@rossmcdonald Let's leave them there for now.

@rossmcdonald
Copy link
Contributor Author

I've also updated the appveyor build to use Go 1.6, though I keep getting a failure in stress:

stress_test.go:417: Expected 0 to not be 0

@jwilder
Copy link
Contributor

jwilder commented May 2, 2016

Maybe try:

diff --git a/stress/stress_test.go b/stress/stress_test.go
index 77e1ae5..a8e3b83 100644
--- a/stress/stress_test.go
+++ b/stress/stress_test.go
@@ -413,8 +413,8 @@ func TestBasicQueryClient_Query(t *testing.T) {
        }

        elapsed := r.Timer.Elapsed()
-       if elapsed == time.Duration(0) {
-               t.Errorf("Expected %v to not be 0", elapsed)
+       if elapsed.Nanoseconds() == 0 {
+               t.Errorf("Expected %v to not be 0", elapsed.Nanoseconds())
        }

 }

@e-dard
Copy link
Contributor

e-dard commented May 3, 2016

LGTM 👍

@rossmcdonald rossmcdonald merged commit 448c0c1 into master May 3, 2016
@mark-rushakoff mark-rushakoff deleted the ross-gh6511 branch May 3, 2016 16:48
@daviesalex
Copy link
Contributor

Production machine change from 0.12 to 0.13 stable:

image

Every other metric pretty much unchanged. +1!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants