From 273228fafa3e43dce6b298a2f34905c811a1446a Mon Sep 17 00:00:00 2001 From: Karthic Rao Date: Tue, 22 Nov 2016 00:17:48 +0530 Subject: [PATCH] Vendor update for dsync, fixing major go routine leak issue. (#3308) --- vendor/github.com/minio/dsync/README.md | 2 +- vendor/github.com/minio/dsync/drwmutex.go | 1 + vendor/github.com/minio/dsync/dsync.go | 4 ++-- vendor/vendor.json | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/vendor/github.com/minio/dsync/README.md b/vendor/github.com/minio/dsync/README.md index 52c7457f0..206e2185c 100644 --- a/vendor/github.com/minio/dsync/README.md +++ b/vendor/github.com/minio/dsync/README.md @@ -16,7 +16,7 @@ This package was developed for the distributed server version of [Minio Object S For [minio](https://minio.io/) the distributed version is started as follows (for a 6-server system): ``` -$ minio server server1/disk server2/disk server3/disk server4/disk server5/disk server6/disk +$ minio server server1:/disk server2:/disk server3:/disk server4:/disk server5:/disk server6:/disk ``` _(note that the same identical command should be run on servers `server1` through to `server6`)_ diff --git a/vendor/github.com/minio/dsync/drwmutex.go b/vendor/github.com/minio/dsync/drwmutex.go index fb75b845a..2b895a6cb 100644 --- a/vendor/github.com/minio/dsync/drwmutex.go +++ b/vendor/github.com/minio/dsync/drwmutex.go @@ -230,6 +230,7 @@ func lock(clnts []RPC, locks *[]string, lockName string, isReadLock bool) bool { } if done { + i++ break } } diff --git a/vendor/github.com/minio/dsync/dsync.go b/vendor/github.com/minio/dsync/dsync.go index d302e924d..b68e36f4c 100644 --- a/vendor/github.com/minio/dsync/dsync.go +++ b/vendor/github.com/minio/dsync/dsync.go @@ -45,8 +45,8 @@ func SetNodesWithClients(rpcClnts []RPC, rpcOwnNode int) (err error) { // Validate if number of nodes is within allowable range. if dnodeCount != 0 { return errors.New("Cannot reinitialize dsync package") - } else if len(rpcClnts) < 4 { - return errors.New("Dsync not designed for less than 4 nodes") + } else if len(rpcClnts) < 2 { + return errors.New("Dsync not designed for less than 2 nodes") } else if len(rpcClnts) > 16 { return errors.New("Dsync not designed for more than 16 nodes") } else if len(rpcClnts)&1 == 1 { diff --git a/vendor/vendor.json b/vendor/vendor.json index 4f2dd6e89..0aae38ac4 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -111,10 +111,10 @@ "revisionTime": "2015-11-18T20:00:48-08:00" }, { - "checksumSHA1": "UWpLeW+oLfe/MiphMckp1HqKrW0=", + "checksumSHA1": "CthggCrV9rr2WmWv8BaqYRVZ5g0=", "path": "github.com/minio/dsync", - "revision": "fcea3bf5533c1b8a5af3cb377d30363782d2532d", - "revisionTime": "2016-10-15T15:40:54Z" + "revision": "1c7e0305144281870a538dc21659c29c14dbe244", + "revisionTime": "2016-11-21T16:22:08Z" }, { "path": "github.com/minio/go-homedir",