[ARVADOS] updated: 22418ed6e4f620ca13c88ac6bc5be87635cd4a00
Git user
git at public.curoverse.com
Wed Sep 6 10:50:12 EDT 2017
Summary of changes:
sdk/go/manifest/manifest.go | 4 ++--
services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go | 4 ++--
services/crunch-run/crunchrun.go | 12 ++++++------
services/crunchstat/crunchstat.go | 2 +-
services/ws/event_source.go | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
via 22418ed6e4f620ca13c88ac6bc5be87635cd4a00 (commit)
from a1d09f06f75f3f003fe6cee8351a101d357461c5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 22418ed6e4f620ca13c88ac6bc5be87635cd4a00
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date: Wed Sep 6 10:49:51 2017 -0400
Apply a few gofmt -s fixes.
No issue #
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>
diff --git a/sdk/go/manifest/manifest.go b/sdk/go/manifest/manifest.go
index 468dbe5..a517c06 100644
--- a/sdk/go/manifest/manifest.go
+++ b/sdk/go/manifest/manifest.go
@@ -352,7 +352,7 @@ func (m *Manifest) segment() (*segmentedManifest, error) {
func (stream segmentedStream) normalizedText(name string) string {
var sortedfiles []string
- for k, _ := range stream {
+ for k := range stream {
sortedfiles = append(sortedfiles, k)
}
sort.Strings(sortedfiles)
@@ -446,7 +446,7 @@ func (m segmentedManifest) manifestTextForPath(srcpath, relocate string) string
}
var sortedstreams []string
- for k, _ := range m {
+ for k := range m {
sortedstreams = append(sortedstreams, k)
}
sort.Strings(sortedstreams)
diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
index 5ab0e4f..5879f84 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
@@ -159,8 +159,8 @@ func (s *TestSuite) TestSbatchFail(c *C) {
var ll arvados.LogList
err = arv.List("logs", arvadosclient.Dict{"filters": [][]string{
- []string{"object_uuid", "=", container.UUID},
- []string{"event_type", "=", "dispatch"},
+ {"object_uuid", "=", container.UUID},
+ {"event_type", "=", "dispatch"},
}}, &ll)
c.Assert(len(ll.Items), Equals, 1)
}
diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 810955c..6ee861b 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -345,7 +345,7 @@ func (runner *ContainerRunner) SetupMounts() (err error) {
needCertMount := true
var binds []string
- for bind, _ := range runner.Container.Mounts {
+ for bind := range runner.Container.Mounts {
binds = append(binds, bind)
}
sort.Strings(binds)
@@ -592,23 +592,23 @@ func (runner *ContainerRunner) LogNodeInfo() (err error) {
logger := log.New(w, "node-info", 0)
commands := []infoCommand{
- infoCommand{
+ {
label: "Host Information",
cmd: []string{"uname", "-a"},
},
- infoCommand{
+ {
label: "CPU Information",
cmd: []string{"cat", "/proc/cpuinfo"},
},
- infoCommand{
+ {
label: "Memory Information",
cmd: []string{"cat", "/proc/meminfo"},
},
- infoCommand{
+ {
label: "Disk Space",
cmd: []string{"df", "-m", "/", os.TempDir()},
},
- infoCommand{
+ {
label: "Disk INodes",
cmd: []string{"df", "-i", "/", os.TempDir()},
},
diff --git a/services/crunchstat/crunchstat.go b/services/crunchstat/crunchstat.go
index 972b6a7..cd84770 100644
--- a/services/crunchstat/crunchstat.go
+++ b/services/crunchstat/crunchstat.go
@@ -117,7 +117,7 @@ func runCommand(argv []string, logger *log.Logger) error {
func sendSignalOnDeadPPID(intvl time.Duration, signum, ppidOrig int, cmd *exec.Cmd, logger *log.Logger) {
ticker := time.NewTicker(intvl)
- for _ = range ticker.C {
+ for range ticker.C {
ppid := os.Getppid()
if ppid == ppidOrig {
continue
diff --git a/services/ws/event_source.go b/services/ws/event_source.go
index cfb828b..9acfca5 100644
--- a/services/ws/event_source.go
+++ b/services/ws/event_source.go
@@ -288,7 +288,7 @@ func (sink *pgEventSink) Stop() {
// Ensure this sink cannot fill up and block the
// server-side queue (which otherwise could in turn
// block our mtx.Lock() here)
- for _ = range sink.channel {
+ for range sink.channel {
}
}()
sink.source.mtx.Lock()
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list