jboss-remoting-commits February 2012

jboss-remoting-commits@lists.jboss.org

1 participants
5 discussions

JBoss Remoting SVN: r6432 - remoting2/branches/2.5.4.SP3_JBREM-1297/src/main/org/jboss/remoting.

by jboss-remoting-commits＠lists.jboss.org

Author: bershath27 Date: 2012-02-13 03:06:16 -0500 (Mon, 13 Feb 2012) New Revision: 6432 Modified: remoting2/branches/2.5.4.SP3_JBREM-1297/src/main/org/jboss/remoting/ConnectionValidator.java Log: JBPAPP-8030 Modified: remoting2/branches/2.5.4.SP3_JBREM-1297/src/main/org/jboss/remoting/ConnectionValidator.java =================================================================== --- remoting2/branches/2.5.4.SP3_JBREM-1297/src/main/org/jboss/remoting/ConnectionValidator.java 2012-02-13 08:05:37 UTC (rev 6431) +++ remoting2/branches/2.5.4.SP3_JBREM-1297/src/main/org/jboss/remoting/ConnectionValidator.java 2012-02-13 08:06:16 UTC (rev 6432) @@ -1077,8 +1077,36 @@ { log.debug(ConnectionValidator.this + " shutting down lease pinger: " + leasePinger); int disconnectTimeout = (failureDisconnectTimeout == -1) ? client.getDisconnectTimeout() : failureDisconnectTimeout; - if (trace) log.trace(ConnectionValidator.this + " disconnectTimeout: " + disconnectTimeout); - sharedInvoker.terminateLease(null, disconnectTimeout, leasePinger); + if (trace) log.trace(ConnectionValidator.this + " disconnectTimeout: " + disconnectTimeout); + + // Synchronizing on Client.connectionValidatorLock to prevent a deadlock: + // + // 1. a. This method calls MicroRemoteClientInvoker.terminateLease() + // b. MicroRemoteClientInvoker.terminateLease() synchronizes on MicroRemoteClientInvoker.clientLeaseLock + // c. MicroRemoteClientInvoker.terminateLease() calls LeasePinger.stopPing() + // d. LeasePinger.stopPing() calls Client.notifyListeners() + // e. Client.notifyListeners() synchronizes on Client.connectionValidatorLock + // + // 2. a. Client.connect() calls Client.setupClientLease() + // b. Client.setupClientLease() synchronizes on Client.connectionValidatorLock + // c. Client.setupClientLease() calls MicroRemoteClientInvoker.establishLease() + // d. MicroRemoteClientInvoker.establishLease() synchronizes on MicroRemoteClientInvoker.clientLeaseLock + // e. MicroRemoteClientInvoker.establishLease() calls Client.addConnectionListener() + // f. Client.addConnectionListener() synchronizes on Client.connectionValidatorLock + // + // 3. a. Client.addConnectionListener() synchronizes on Client.connectionValidatorLock + // b. Client.addConnectionListener() calls new ConnectionValidator() + // c. new ConnectionValidator() calls MicroRemoteClientInvoker.getLeasePinger() + // d. MicroRemoteClientInvoker.getLeasePinger() synchronizes on MicroRemoteClientInvoker.clientLeaseLock + // + // By synchronizing on connectionValidatorLock here, we assure that all sequences acquire + // Client.connectionValidatorLock first and then acquire MicroRemoteClientInvoker.clientLeaseLock. + // + // See JBREM-1242 and JBREM-1297. + synchronized (Client.getConnectionValidatorLock()) + { + sharedInvoker.terminateLease(null, disconnectTimeout, leasePinger); + } } else {

12 years, 9 months

1
0
0 / 0

JBoss Remoting SVN: r6431 - remoting2/branches/2.5.4.SP3_JBREM-1297/src/main/org/jboss/remoting.

by jboss-remoting-commits＠lists.jboss.org

Author: bershath27 Date: 2012-02-13 03:05:37 -0500 (Mon, 13 Feb 2012) New Revision: 6431 Modified: remoting2/branches/2.5.4.SP3_JBREM-1297/src/main/org/jboss/remoting/Client.java Log: JBPAPP-8030 Modified: remoting2/branches/2.5.4.SP3_JBREM-1297/src/main/org/jboss/remoting/Client.java =================================================================== --- remoting2/branches/2.5.4.SP3_JBREM-1297/src/main/org/jboss/remoting/Client.java 2012-02-08 13:17:29 UTC (rev 6430) +++ remoting2/branches/2.5.4.SP3_JBREM-1297/src/main/org/jboss/remoting/Client.java 2012-02-13 08:05:37 UTC (rev 6431) @@ -1904,6 +1904,12 @@ } } + + static Object getConnectionValidatorLock() + { + return connectionValidatorLock; + } + // Protected ------------------------------------------------------------------------------------ // Private -------------------------------------------------------------------------------------- @@ -2040,17 +2046,25 @@ // // 1. a. This method calls MicroRemoteClientInvoker.establishLease() // b. MicroRemoteClientInvoker.establishLease() synchronizes on MicroRemoteClientInvoker.clientLeaseLock - // and calls Client.addConnectionListener() - // c. Client.addConnectionListener() synchronizes on Client.connectionValidatorLock + // c. MicroRemoteClientInvoker.establishLease() calls Client.addConnectionListener() + // d. Client.addConnectionListener() synchronizes on Client.connectionValidatorLock // - // 2. a. Client.addConnectionListener() synchronizes on Client.connectionValidatorLock and calls - // new ConnectionValidator() - // b. new ConnectionValidator() calls MicroRemoteClientInvoker.getLeasePinger(), which - // synchronizes on MicroRemoteClientInvoker.clientLeaseLock + // 2. a. Client.addConnectionListener() synchronizes on Client.connectionValidatorLock + // b. Client.addConnectionListener() calls new ConnectionValidator() + // c. new ConnectionValidator() calls MicroRemoteClientInvoker.getLeasePinger() + // d. MicroRemoteClientInvoker.getLeasePinger() synchronizes on MicroRemoteClientInvoker.clientLeaseLock // - // By synchronizing on connectionValidatorLock here, we assure that both sequences acquire + // 3. a. ConnectionValidator$WaitOnConnectionCheckTimerTask.run() synchronizes on Client.connectionValidatorLock + // b. ConnectionValidator$WaitOnConnectionCheckTimerTask.run() calls MicroRemoteClientInvoker.terminateLease() + // c. MicroRemoteClientInvoker.terminateLease() synchronizes on MicroRemoteClientInvoker.clientLeaseLock + // d. MicroRemoteClientInvoker.terminateLease() calls LeasePinger.stopPing() + // e. LeasePinger.stopPing() calls Client.notifyListeners() + // f. Client.notifyListeners() synchronizes on Client.connectionValidatorLock + // + // By synchronizing on connectionValidatorLock here, we assure that all sequences acquire // Client.connectionValidatorLock first and then acquire MicroRemoteClientInvoker.clientLeaseLock. // + // See JBREM-1242 and JBREM-1297. synchronized(connectionValidatorLock) { invoker.establishLease(sessionId, temp, leasePeriod);

12 years, 9 months

1
0
0 / 0

JBoss Remoting SVN: r6430 - remoting2/branches.

by jboss-remoting-commits＠lists.jboss.org

Author: bershath27 Date: 2012-02-08 08:17:29 -0500 (Wed, 08 Feb 2012) New Revision: 6430 Added: remoting2/branches/2.5.4.SP3_JBREM-1297/ Log: JBPAPP-8030

12 years, 9 months

1
0
0 / 0

JBoss Remoting SVN: r6429 - remoting2/branches.

by jboss-remoting-commits＠lists.jboss.org

Author: bershath27 Date: 2012-02-07 23:37:33 -0500 (Tue, 07 Feb 2012) New Revision: 6429 Removed: remoting2/branches/2.5.2.SP2_JBREM-1297/ Log: mistakenly created branch. it should be JBossRemoting-2.5.4.SP3_JBREM-1297

12 years, 9 months

1
0
0 / 0

JBoss Remoting SVN: r6428 - remoting2/branches.

by jboss-remoting-commits＠lists.jboss.org

Author: bershath27 Date: 2012-02-07 18:08:49 -0500 (Tue, 07 Feb 2012) New Revision: 6428 Added: remoting2/branches/2.5.2.SP2_JBREM-1297/ Log: JBPAPP-8030

12 years, 9 months

1
0
0 / 0

← Newer
1
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jboss-remoting-commits February 2012