[ARVADOS] updated: cad24bba2240b47f59bc5719a035e85ff5eb60ef

Git user git at public.curoverse.com
Fri May 19 16:12:05 EDT 2017


Summary of changes:
 services/keep-web/handler_test.go     | 101 +++++++++++++++-------------------
 services/keep-web/integration_test.go |  32 -----------
 services/keep-web/ranges_test.go      |   2 +-
 services/keep-web/server_test.go      |  50 +++++++++++------
 4 files changed, 78 insertions(+), 107 deletions(-)
 delete mode 100644 services/keep-web/integration_test.go

  discards  1eb8881aab5e864b93cb36b32cf00ed05ee3df0a (commit)
  discards  ccf1048de4e74e4e002af0905a5b7c328afe254c (commit)
  discards  23721f23b103016dba83111b2cc52920726e9fdf (commit)
       via  cad24bba2240b47f59bc5719a035e85ff5eb60ef (commit)
       via  1e7d0d5fe2d2ec5c4fdbbe18d047ab70d8ae5db1 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (1eb8881aab5e864b93cb36b32cf00ed05ee3df0a)
            \
             N -- N -- N (cad24bba2240b47f59bc5719a035e85ff5eb60ef)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 cad24bba2240b47f59bc5719a035e85ff5eb60ef
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri May 19 15:55:40 2017 -0400

    9005: Fix missing error checks.

diff --git a/sdk/go/keepclient/hashcheck.go b/sdk/go/keepclient/hashcheck.go
index 1706134..b97df78 100644
--- a/sdk/go/keepclient/hashcheck.go
+++ b/sdk/go/keepclient/hashcheck.go
@@ -63,8 +63,14 @@ func (this HashCheckingReader) WriteTo(dest io.Writer) (written int64, err error
 func (this HashCheckingReader) Close() (err error) {
 	_, err = io.Copy(this.Hash, this.Reader)
 
-	if closer, ok := this.Reader.(io.ReadCloser); ok {
-		err = closer.Close()
+	if closer, ok := this.Reader.(io.Closer); ok {
+		err2 := closer.Close()
+		if err2 != nil && err == nil {
+			return err2
+		}
+	}
+	if err != nil {
+		return err
 	}
 
 	sum := this.Hash.Sum(make([]byte, 0, this.Hash.Size()))

commit 1e7d0d5fe2d2ec5c4fdbbe18d047ab70d8ae5db1
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri May 19 15:55:22 2017 -0400

    9005: Fix missing Close().

diff --git a/sdk/go/keepclient/block_cache.go b/sdk/go/keepclient/block_cache.go
index 7d03b68..77eb317 100644
--- a/sdk/go/keepclient/block_cache.go
+++ b/sdk/go/keepclient/block_cache.go
@@ -64,6 +64,10 @@ func (c *BlockCache) Get(kc *KeepClient, locator string) ([]byte, error) {
 			var data []byte
 			if err == nil {
 				data, err = ioutil.ReadAll(rdr)
+				err2 := rdr.Close()
+				if err == nil {
+					err = err2
+				}
 			}
 			c.mtx.Lock()
 			b.data, b.err = data, err

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list