[ARVADOS] updated: 1.3.0-3259-gd356f441d

Git user git at public.arvados.org
Sun Oct 4 21:25:55 UTC 2020


Summary of changes:
 doc/sdk/cli/reference.html.textile.liquid |  2 ++
 sdk/go/keepclient/keepclient_test.go      | 38 +++++++++++++++----------------
 sdk/go/keepclient/support.go              | 36 ++++++++++++++---------------
 3 files changed, 39 insertions(+), 37 deletions(-)

       via  d356f441d55dfdc26a0ec3f1db344923b1e9b79d (commit)
       via  4634996f95b20da8bf0f523e4b901e2a83a43633 (commit)
      from  79455c249d7227627948b5b9ff121efd42fbc4fe (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 d356f441d55dfdc26a0ec3f1db344923b1e9b79d
Author: Ward Vandewege <ward at curii.com>
Date:   Sun Oct 4 17:25:37 2020 -0400

    Fix more golint warnings.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/sdk/go/keepclient/keepclient_test.go b/sdk/go/keepclient/keepclient_test.go
index 2604b02b1..8d595fbe1 100644
--- a/sdk/go/keepclient/keepclient_test.go
+++ b/sdk/go/keepclient/keepclient_test.go
@@ -139,9 +139,9 @@ func UploadToStubHelper(c *C, st http.Handler, f func(*KeepClient, string,
 	kc, _ := MakeKeepClient(arv)
 
 	reader, writer := io.Pipe()
-	upload_status := make(chan uploadStatus)
+	uploadStatusChan := make(chan uploadStatus)
 
-	f(kc, ks.url, reader, writer, upload_status)
+	f(kc, ks.url, reader, writer, uploadStatusChan)
 }
 
 func (s *StandaloneSuite) TestUploadToStubKeepServer(c *C) {
@@ -156,15 +156,15 @@ func (s *StandaloneSuite) TestUploadToStubKeepServer(c *C) {
 		make(chan string)}
 
 	UploadToStubHelper(c, st,
-		func(kc *KeepClient, url string, reader io.ReadCloser, writer io.WriteCloser, upload_status chan uploadStatus) {
+		func(kc *KeepClient, url string, reader io.ReadCloser, writer io.WriteCloser, uploadStatusChan chan uploadStatus) {
 			kc.StorageClasses = []string{"hot"}
-			go kc.uploadToKeepServer(url, st.expectPath, reader, upload_status, int64(len("foo")), kc.getRequestID())
+			go kc.uploadToKeepServer(url, st.expectPath, reader, uploadStatusChan, int64(len("foo")), kc.getRequestID())
 
 			writer.Write([]byte("foo"))
 			writer.Close()
 
 			<-st.handled
-			status := <-upload_status
+			status := <-uploadStatusChan
 			c.Check(status, DeepEquals, uploadStatus{nil, fmt.Sprintf("%s/%s", url, st.expectPath), 200, 1, ""})
 		})
 }
@@ -179,12 +179,12 @@ func (s *StandaloneSuite) TestUploadToStubKeepServerBufferReader(c *C) {
 		make(chan string)}
 
 	UploadToStubHelper(c, st,
-		func(kc *KeepClient, url string, _ io.ReadCloser, _ io.WriteCloser, upload_status chan uploadStatus) {
-			go kc.uploadToKeepServer(url, st.expectPath, bytes.NewBuffer([]byte("foo")), upload_status, 3, kc.getRequestID())
+		func(kc *KeepClient, url string, _ io.ReadCloser, _ io.WriteCloser, uploadStatusChan chan uploadStatus) {
+			go kc.uploadToKeepServer(url, st.expectPath, bytes.NewBuffer([]byte("foo")), uploadStatusChan, 3, kc.getRequestID())
 
 			<-st.handled
 
-			status := <-upload_status
+			status := <-uploadStatusChan
 			c.Check(status, DeepEquals, uploadStatus{nil, fmt.Sprintf("%s/%s", url, st.expectPath), 200, 1, ""})
 		})
 }
@@ -233,16 +233,16 @@ func (s *StandaloneSuite) TestFailedUploadToStubKeepServer(c *C) {
 
 	UploadToStubHelper(c, st,
 		func(kc *KeepClient, url string, reader io.ReadCloser,
-			writer io.WriteCloser, upload_status chan uploadStatus) {
+			writer io.WriteCloser, uploadStatusChan chan uploadStatus) {
 
-			go kc.uploadToKeepServer(url, hash, reader, upload_status, 3, kc.getRequestID())
+			go kc.uploadToKeepServer(url, hash, reader, uploadStatusChan, 3, kc.getRequestID())
 
 			writer.Write([]byte("foo"))
 			writer.Close()
 
 			<-st.handled
 
-			status := <-upload_status
+			status := <-uploadStatusChan
 			c.Check(status.url, Equals, fmt.Sprintf("%s/%s", url, hash))
 			c.Check(status.statusCode, Equals, 500)
 		})
@@ -770,9 +770,9 @@ type BarHandler struct {
 	handled chan string
 }
 
-func (this BarHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
+func (h BarHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
 	resp.Write([]byte("bar"))
-	this.handled <- fmt.Sprintf("http://%s", req.Host)
+	h.handled <- fmt.Sprintf("http://%s", req.Host)
 }
 
 func (s *StandaloneSuite) TestChecksum(c *C) {
@@ -860,9 +860,9 @@ func (s *StandaloneSuite) TestGetWithFailures(c *C) {
 	c.Check(n, Equals, int64(3))
 	c.Check(url2, Equals, fmt.Sprintf("%s/%s", ks1[0].url, hash))
 
-	read_content, err2 := ioutil.ReadAll(r)
+	readContent, err2 := ioutil.ReadAll(r)
 	c.Check(err2, Equals, nil)
-	c.Check(read_content, DeepEquals, content)
+	c.Check(readContent, DeepEquals, content)
 }
 
 func (s *ServerRequiredSuite) TestPutGetHead(c *C) {
@@ -892,9 +892,9 @@ func (s *ServerRequiredSuite) TestPutGetHead(c *C) {
 		c.Check(n, Equals, int64(len(content)))
 		c.Check(url2, Matches, fmt.Sprintf("http://localhost:\\d+/%s", hash))
 
-		read_content, err2 := ioutil.ReadAll(r)
+		readContent, err2 := ioutil.ReadAll(r)
 		c.Check(err2, Equals, nil)
-		c.Check(read_content, DeepEquals, content)
+		c.Check(readContent, DeepEquals, content)
 	}
 	{
 		n, url2, err := kc.Ask(hash)
@@ -921,9 +921,9 @@ type StubProxyHandler struct {
 	handled chan string
 }
 
-func (this StubProxyHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
+func (h StubProxyHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
 	resp.Header().Set("X-Keep-Replicas-Stored", "2")
-	this.handled <- fmt.Sprintf("http://%s", req.Host)
+	h.handled <- fmt.Sprintf("http://%s", req.Host)
 }
 
 func (s *StandaloneSuite) TestPutProxy(c *C) {
diff --git a/sdk/go/keepclient/support.go b/sdk/go/keepclient/support.go
index 7989e66c0..594379b4f 100644
--- a/sdk/go/keepclient/support.go
+++ b/sdk/go/keepclient/support.go
@@ -48,22 +48,22 @@ type svcList struct {
 }
 
 type uploadStatus struct {
-	err             error
-	url             string
-	statusCode      int
-	replicas_stored int
-	response        string
+	err            error
+	url            string
+	statusCode     int
+	replicasStored int
+	response       string
 }
 
 func (this *KeepClient) uploadToKeepServer(host string, hash string, body io.Reader,
-	upload_status chan<- uploadStatus, expectedLength int64, reqid string) {
+	uploadStatusChan chan<- uploadStatus, expectedLength int64, reqid string) {
 
 	var req *http.Request
 	var err error
 	var url = fmt.Sprintf("%s/%s", host, hash)
 	if req, err = http.NewRequest("PUT", url, nil); err != nil {
 		DebugPrintf("DEBUG: [%s] Error creating request PUT %v error: %v", reqid, url, err.Error())
-		upload_status <- uploadStatus{err, url, 0, 0, ""}
+		uploadStatusChan <- uploadStatus{err, url, 0, 0, ""}
 		return
 	}
 
@@ -87,7 +87,7 @@ func (this *KeepClient) uploadToKeepServer(host string, hash string, body io.Rea
 	var resp *http.Response
 	if resp, err = this.httpClient().Do(req); err != nil {
 		DebugPrintf("DEBUG: [%s] Upload failed %v error: %v", reqid, url, err.Error())
-		upload_status <- uploadStatus{err, url, 0, 0, err.Error()}
+		uploadStatusChan <- uploadStatus{err, url, 0, 0, err.Error()}
 		return
 	}
 
@@ -103,16 +103,16 @@ func (this *KeepClient) uploadToKeepServer(host string, hash string, body io.Rea
 	response := strings.TrimSpace(string(respbody))
 	if err2 != nil && err2 != io.EOF {
 		DebugPrintf("DEBUG: [%s] Upload %v error: %v response: %v", reqid, url, err2.Error(), response)
-		upload_status <- uploadStatus{err2, url, resp.StatusCode, rep, response}
+		uploadStatusChan <- uploadStatus{err2, url, resp.StatusCode, rep, response}
 	} else if resp.StatusCode == http.StatusOK {
 		DebugPrintf("DEBUG: [%s] Upload %v success", reqid, url)
-		upload_status <- uploadStatus{nil, url, resp.StatusCode, rep, response}
+		uploadStatusChan <- uploadStatus{nil, url, resp.StatusCode, rep, response}
 	} else {
 		if resp.StatusCode >= 300 && response == "" {
 			response = resp.Status
 		}
 		DebugPrintf("DEBUG: [%s] Upload %v error: %v response: %v", reqid, url, resp.StatusCode, response)
-		upload_status <- uploadStatus{errors.New(resp.Status), url, resp.StatusCode, rep, response}
+		uploadStatusChan <- uploadStatus{errors.New(resp.Status), url, resp.StatusCode, rep, response}
 	}
 }
 
@@ -133,16 +133,16 @@ func (this *KeepClient) putReplicas(
 	active := 0
 
 	// Used to communicate status from the upload goroutines
-	upload_status := make(chan uploadStatus)
+	uploadStatusChan := make(chan uploadStatus)
 	defer func() {
 		// Wait for any abandoned uploads (e.g., we started
 		// two uploads and the first replied with replicas=2)
 		// to finish before closing the status channel.
 		go func() {
 			for active > 0 {
-				<-upload_status
+				<-uploadStatusChan
 			}
-			close(upload_status)
+			close(uploadStatusChan)
 		}()
 	}()
 
@@ -169,7 +169,7 @@ func (this *KeepClient) putReplicas(
 				// Start some upload requests
 				if nextServer < len(sv) {
 					DebugPrintf("DEBUG: [%s] Begin upload %s to %s", reqid, hash, sv[nextServer])
-					go this.uploadToKeepServer(sv[nextServer], hash, getReader(), upload_status, expectedLength, reqid)
+					go this.uploadToKeepServer(sv[nextServer], hash, getReader(), uploadStatusChan, expectedLength, reqid)
 					nextServer += 1
 					active += 1
 				} else {
@@ -189,13 +189,13 @@ func (this *KeepClient) putReplicas(
 
 			// Now wait for something to happen.
 			if active > 0 {
-				status := <-upload_status
+				status := <-uploadStatusChan
 				active -= 1
 
 				if status.statusCode == 200 {
 					// good news!
-					replicasDone += status.replicas_stored
-					replicasTodo -= status.replicas_stored
+					replicasDone += status.replicasStored
+					replicasTodo -= status.replicasStored
 					locator = status.response
 					delete(lastError, status.url)
 				} else {

commit 4634996f95b20da8bf0f523e4b901e2a83a43633
Author: Ward Vandewege <ward at curii.com>
Date:   Sun Oct 4 17:10:27 2020 -0400

    Add a cli example: create an empty collection.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/doc/sdk/cli/reference.html.textile.liquid b/doc/sdk/cli/reference.html.textile.liquid
index e1d25aaa2..735ba5ca8 100644
--- a/doc/sdk/cli/reference.html.textile.liquid
+++ b/doc/sdk/cli/reference.html.textile.liquid
@@ -42,6 +42,8 @@ Get list of groups
 Delete a group
 @arv group delete --uuid 6dnxa-j7d0g-iw7i6n43d37jtog@
 
+Create an empty collection
+ at arv collection create --collection '{"name": "test collection"}'@
 
 h3. Common commands
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list