Move to Go 1.5

CHANGELOG.md

@@ -1,6 +1,10 @@
 ## v0.9.4 [unreleased]
 
+### Release Notes
+With this release InfluxDB is moving to Go 1.5.
+
 ### Features
+-[#3863](https://github.com/influxdb/influxdb/pull/3863): Move to Go 1.5
 
 ### Bugfixes
 - [#3804](https://github.com/influxdb/influxdb/pull/3804): init.d script fixes, fixes issue 3803.

CONTRIBUTING.md

@@ -79,16 +79,16 @@ second to sign our CLA, which can be found
 
 Installing Go
 -------------
-InfluxDB requires Go 1.4 or greater.
+InfluxDB requires Go 1.5 or greater.
 
 At InfluxDB we find gvm, a Go version manager, useful for installing Go. For instructions
 on how to install it see [the gvm page on github](https://github.com/moovweb/gvm).
 
 After installing gvm you can install and set the default go version by
 running the following:
 
-    gvm install go1.4
-    gvm use go1.4 --default
+    gvm install go1.5
+    gvm use go1.5 --default
 
 Revision Control Systems
 ------
@@ -156,7 +156,7 @@ go install ./...
 To set the version and commit flags during the build pass the following to the build command:
 
 ```bash
--ldflags="-X main.version $VERSION -X main.branch $BRANCH -X main.commit $COMMIT"
+-ldflags="-X main.version $VERSION -X main.branch=$BRANCH -X main.commit=$COMMIT"
 ```
 
 where `$VERSION` is the version, `$BRANCH` is the branch, and `$COMMIT` is the git commit hash.

Dockerfile_test_ubuntu32

@@ -1,8 +1,8 @@
 FROM 32bit/ubuntu:14.04
 
 RUN apt-get update && apt-get install -y python-software-properties software-properties-common git
-RUN add-apt-repository ppa:evarlast/golang1.4
-RUN apt-get update && apt-get install -y golang-go
+RUN add-apt-repository ppa:evarlast/golang1.5
+RUN apt-get update && apt-get install -y -o Dpkg::Options::="--force-overwrite" golang-go
 
 ENV GOPATH=/root/go
 RUN mkdir -p /root/go/src/github.com/influxdb/influxdb

circle-test.sh

@@ -5,7 +5,7 @@
 # build process for InfluxDB.
 
 BUILD_DIR=$HOME/influxdb-build
-GO_VERSION=go1.4.2
+GO_VERSION=go1.5
 PARALLELISM="-parallel 256"
 TIMEOUT="-timeout 480s"
 

circle.yml

@@ -3,7 +3,7 @@ machine:
         - docker
     pre:
         - bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer)
-        - source $HOME/.gvm/scripts/gvm; gvm install go1.4.2 --binary
+        - source $HOME/.gvm/scripts/gvm; gvm install go1.5 --binary
 
 dependencies:
     override:

client/influxdb_test.go

@@ -498,13 +498,12 @@ func TestBatchPoints_Normal(t *testing.T) {
 }
 
 func TestClient_Timeout(t *testing.T) {
+	done := make(chan bool)
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		time.Sleep(1 * time.Second)
-		var data client.Response
-		w.WriteHeader(http.StatusOK)
-		_ = json.NewEncoder(w).Encode(data)
+		<-done
 	}))
 	defer ts.Close()
+	defer func() { done <- true }()
 
 	u, _ := url.Parse(ts.URL)
 	config := client.Config{URL: *u, Timeout: 500 * time.Millisecond}
@@ -517,13 +516,32 @@ func TestClient_Timeout(t *testing.T) {
 	_, err = c.Query(query)
 	if err == nil {
 		t.Fatalf("unexpected success.  expected timeout error")
-	} else if !strings.Contains(err.Error(), "use of closed network connection") {
-		t.Fatalf("unexpected error.  expected 'use of closed network connection' error, got %v", err)
+	} else if !strings.Contains(err.Error(), "request canceled") {
+		t.Fatalf("unexpected error.  expected 'request canceled' error, got %v", err)
 	}
+}
 
-	confignotimeout := client.Config{URL: *u}
-	cnotimeout, err := client.NewClient(confignotimeout)
-	_, err = cnotimeout.Query(query)
+func TestClient_NoTimeout(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping in short mode")
+	}
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		time.Sleep(1 * time.Second)
+		var data client.Response
+		w.WriteHeader(http.StatusOK)
+		_ = json.NewEncoder(w).Encode(data)
+	}))
+	defer ts.Close()
+
+	u, _ := url.Parse(ts.URL)
+	config := client.Config{URL: *u}
+	c, err := client.NewClient(config)
+	if err != nil {
+		t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
+	}
+
+	query := client.Query{}
+	_, err = c.Query(query)
 	if err != nil {
 		t.Fatalf("unexpected error.  expected %v, actual %v", nil, err)
 	}

cmd/influxd/run/command.go

@@ -71,9 +71,6 @@ func (cmd *Command) Run(args ...string) error {
 		return fmt.Errorf("write pid file: %s", err)
 	}
 
-	// Set parallelism.
-	runtime.GOMAXPROCS(runtime.NumCPU())
-
 	// Turn on block profiling to debug stuck databases
 	runtime.SetBlockProfileRate(int(1 * time.Second))
 

package.sh

@@ -57,7 +57,7 @@ if [ -z "$FPM" ]; then
     FPM=`which fpm`
 fi
 
-GO_VERSION="go1.4.2"
+GO_VERSION="go1.5"
 GOPATH_INSTALL=
 BINS=(
     influxd
@@ -190,7 +190,7 @@ do_build() {
         cleanup_exit 1
     fi
 
-    go install -a -ldflags="-X main.version $version -X main.branch $branch -X main.commit $commit" ./...
+    go install -a -ldflags="-X main.version $version -X main.branch=$branch -X main.commit=$commit" ./...
     if [ $? -ne 0 ]; then
         echo "Build failed, unable to create package -- aborting"
         cleanup_exit 1