The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/4253

This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.

=== Description (from pull-request) ===
Signed-off-by: St├ęphane Graber <stgra...@ubuntu.com>
From 91b70ff5f43adc588ed292b028eba45cab50b1cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Tue, 13 Feb 2018 18:00:20 -0500
Subject: [PATCH] lxd-benchmark: Fix new go vet warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: St├ęphane Graber <stgra...@ubuntu.com>
---
 lxd-benchmark/benchmark/benchmark.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lxd-benchmark/benchmark/benchmark.go 
b/lxd-benchmark/benchmark/benchmark.go
index 9e8abf9e2..2d96f6fdb 100644
--- a/lxd-benchmark/benchmark/benchmark.go
+++ b/lxd-benchmark/benchmark/benchmark.go
@@ -51,7 +51,7 @@ func LaunchContainers(c lxd.ContainerServer, count int, 
parallel int, image stri
                return duration, err
        }
 
-       startContainer := func(index int, wg *sync.WaitGroup) {
+       batchStart := func(index int, wg *sync.WaitGroup) {
                defer wg.Done()
 
                name := getContainerName(count, index)
@@ -79,7 +79,7 @@ func LaunchContainers(c lxd.ContainerServer, count int, 
parallel int, image stri
                }
        }
 
-       duration = processBatch(count, batchSize, startContainer)
+       duration = processBatch(count, batchSize, batchStart)
        return duration, nil
 }
 
@@ -92,7 +92,7 @@ func CreateContainers(c lxd.ContainerServer, count int, 
parallel int, fingerprin
                return duration, err
        }
 
-       createContainer := func(index int, wg *sync.WaitGroup) {
+       batchCreate := func(index int, wg *sync.WaitGroup) {
                defer wg.Done()
 
                name := getContainerName(count, index)
@@ -104,7 +104,7 @@ func CreateContainers(c lxd.ContainerServer, count int, 
parallel int, fingerprin
                }
        }
 
-       duration = processBatch(count, batchSize, createContainer)
+       duration = processBatch(count, batchSize, batchCreate)
 
        return duration, nil
 }
@@ -139,7 +139,7 @@ func StartContainers(c lxd.ContainerServer, containers 
[]api.Container, parallel
        count := len(containers)
        logf("Starting %d containers", count)
 
-       startContainer := func(index int, wg *sync.WaitGroup) {
+       batchStart := func(index int, wg *sync.WaitGroup) {
                defer wg.Done()
 
                container := containers[index]
@@ -152,7 +152,7 @@ func StartContainers(c lxd.ContainerServer, containers 
[]api.Container, parallel
                }
        }
 
-       duration = processBatch(count, batchSize, startContainer)
+       duration = processBatch(count, batchSize, batchStart)
        return duration, nil
 }
 
@@ -168,7 +168,7 @@ func StopContainers(c lxd.ContainerServer, containers 
[]api.Container, parallel
        count := len(containers)
        logf("Stopping %d containers", count)
 
-       stopContainer := func(index int, wg *sync.WaitGroup) {
+       batchStop := func(index int, wg *sync.WaitGroup) {
                defer wg.Done()
 
                container := containers[index]
@@ -181,7 +181,7 @@ func StopContainers(c lxd.ContainerServer, containers 
[]api.Container, parallel
                }
        }
 
-       duration = processBatch(count, batchSize, stopContainer)
+       duration = processBatch(count, batchSize, batchStop)
        return duration, nil
 }
 
@@ -197,7 +197,7 @@ func DeleteContainers(c lxd.ContainerServer, containers 
[]api.Container, paralle
        count := len(containers)
        logf("Deleting %d containers", count)
 
-       deleteContainer := func(index int, wg *sync.WaitGroup) {
+       batchDelete := func(index int, wg *sync.WaitGroup) {
                defer wg.Done()
 
                container := containers[index]
@@ -217,7 +217,7 @@ func DeleteContainers(c lxd.ContainerServer, containers 
[]api.Container, paralle
                }
        }
 
-       duration = processBatch(count, batchSize, deleteContainer)
+       duration = processBatch(count, batchSize, batchDelete)
        return duration, nil
 }
 
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

Reply via email to