Merge branch 'release-1.16.3' into stable

NVIDIA · Jul 3, 2020 · 2a9ed63 · 2a9ed63
2 parents 2e1f659 + 035090e
commit 2a9ed63
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/jrpcfs/config.go b/jrpcfs/config.go
@@ -249,6 +249,7 @@ func (dummy *globalsStruct) Up(confMap conf.ConfMap) (err error) {
 	retryRPCServerUp(jserver, globals.publicIPAddr, globals.retryRPCPort, globals.retryRPCTTLCompleted, globals.retryRPCAckTrim,
 		globals.retryRPCDeadlineIO, globals.retryRPCKeepAlivePeriod)
 
+	err = nil
 	return
 }
 

diff --git a/liveness/polling.go b/liveness/polling.go
@@ -525,11 +525,13 @@ func computeLivenessCheckAssignments(observingPeerNameList []string) (internalLi
 															err = json.Unmarshal(ringFilePayload, ringFilePayloadJSON)
 															if nil == err {
 																for _, ringFilePayloadJSONDev = range ringFilePayloadJSON.Devs {
-																	_, alreadyInSwiftReconEndpointIAddrSet = swiftReconEndpointIPAddrSet[ringFilePayloadJSONDev.IP]
-																	if !alreadyInSwiftReconEndpointIAddrSet {
-																		swiftReconEndpointIPAddrSet[ringFilePayloadJSONDev.IP] = struct{}{}
-																		swiftReconEndpoint = fmt.Sprintf("%s:%d", ringFilePayloadJSONDev.IP, ringFilePayloadJSONDev.Port)
-																		globals.swiftReconEndpointSet[swiftReconEndpoint] = struct{}{}
+																	if nil != ringFilePayloadJSONDev {
+																		_, alreadyInSwiftReconEndpointIAddrSet = swiftReconEndpointIPAddrSet[ringFilePayloadJSONDev.IP]
+																		if !alreadyInSwiftReconEndpointIAddrSet {
+																			swiftReconEndpointIPAddrSet[ringFilePayloadJSONDev.IP] = struct{}{}
+																			swiftReconEndpoint = fmt.Sprintf("%s:%d", ringFilePayloadJSONDev.IP, ringFilePayloadJSONDev.Port)
+																			globals.swiftReconEndpointSet[swiftReconEndpoint] = struct{}{}
+																		}
 																	}
 																}
 															} else {

diff --git a/release_notes.md b/release_notes.md
@@ -1,6 +1,6 @@
 # ProxyFS Release Notes
 
-## 1.16.2 (July 1, 2020)
+## 1.16.3 (July 2, 2020)
 
 ### Bug Fixes:
-Original file line number
+Diff line change
@@ Expand Up @@
     	retryRPCServerUp(jserver, globals.publicIPAddr, globals.retryRPCPort, globals.retryRPCTTLCompleted, globals.retryRPCAckTrim,
     		globals.retryRPCDeadlineIO, globals.retryRPCKeepAlivePeriod)
+    	err = nil
     	return
     }
@@ Expand Down @@