FABN-1058 NodeSDK handler close peer

Have the handler close the peer connection on error. Change-Id: Iac956cb7e27fb792540976ce68057f1f5ba49937 Signed-off-by: Bret Harrison <[email protected]>
hyperledger · Dec 13, 2018 · 89e8c4b · 89e8c4b
1 parent f7df755
commit 89e8c4b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/fabric-client/lib/Peer.js b/fabric-client/lib/Peer.js
@@ -51,8 +51,20 @@ class Peer extends Remote {
 		super(url, opts);
 
 		logger.debug('Peer.const - url: %s timeout: %s name:%s', url, this._request_timeout, this.getName());
-		this._endorserClient = new _serviceProto.Endorser(this._endpoint.addr, this._endpoint.creds, this._options);
-		this._discoveryClient = new _discoveryProto.Discovery(this._endpoint.addr, this._endpoint.creds, this._options);
+		this._endorserClient = null;
+		this._discoveryClient = null;
+		this._createClients();
+	}
+
+	_createClients() {
+		if (!this._endorserClient) {
+			logger.debug('_createClients - create peer endorser connection ' + this._endpoint.addr);
+			this._endorserClient = new _serviceProto.Endorser(this._endpoint.addr, this._endpoint.creds, this._options);
+		}
+		if (!this._discoveryClient) {
+			logger.debug('_createClients - create peer discovery connection ' + this._endpoint.addr);
+			this._discoveryClient = new _discoveryProto.Discovery(this._endpoint.addr, this._endpoint.creds, this._options);
+		}
 	}
 
 	/**
@@ -62,10 +74,12 @@ class Peer extends Remote {
 		if (this._endorserClient) {
 			logger.debug('close - closing peer endorser connection ' + this._endpoint.addr);
 			this._endorserClient.close();
+			this._endorserClient = null;
 		}
 		if (this._discoveryClient) {
 			logger.debug('close - closing peer discovery connection ' + this._endpoint.addr);
 			this._discoveryClient.close();
+			this._discoveryClient = null;
 		}
 	}
 
@@ -95,6 +109,8 @@ class Peer extends Remote {
 			throw new Error('Missing proposal to send to peer');
 		}
 
+		this._createClients();
+
 		await this.waitForReady(this._endorserClient);
 
 		return new Promise((resolve, reject) => {
@@ -166,6 +182,8 @@ class Peer extends Remote {
 			return Promise.reject(new Error('Missing request to send to peer discovery service'));
 		}
 
+		this._createClients();
+
 		return this.waitForReady(this._discoveryClient).then(() => {
 			return new Promise((resolve, reject) => {
 				const send_timeout = setTimeout(() => {

diff --git a/fabric-client/lib/impl/DiscoveryEndorsementHandler.js b/fabric-client/lib/impl/DiscoveryEndorsementHandler.js
@@ -277,6 +277,10 @@ class DiscoveryEndorsementHandler extends api.EndorsementHandler {
 						} catch (caught_error) {
 							if (!(caught_error instanceof Error)) {
 								error = new Error(caught_error.toString());
+								// if this peer failed to connect then close it
+								if (error.connectFailed) {
+									peer.close();
+								}
 							} else {
 								error = caught_error;
 							}