Skip to content

Added a new MongoOption: maxConnectionRetryTime #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Added a new MongoOption: maxConnectionRetryTime #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60b1d60
mavenPush supports systems that lack sha1sum
sirsean Jul 18, 2011
8f6979e
New MongoOption: maxConnectionRetryTime
sirsean Jul 18, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions mavenPush.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,13 @@ def go( pkgName, shortName , longName ):
out.write( pom )
out.close()

p = subprocess.Popen( [ "sha1sum" , fileRoot + ".jar" ] , stdout=subprocess.PIPE ).communicate()
sha1 = p[0].split( ' ' )[0]
hasSha1Sum = subprocess.Popen( [ "which", "sha1sum" ] , stdout=subprocess.PIPE ).communicate()
if hasSha1Sum[0] != '':
p = subprocess.Popen( [ "sha1sum" , fileRoot + ".jar" ] , stdout=subprocess.PIPE ).communicate()
sha1 = p[0].split( ' ' )[0]
else:
p = subprocess.Popen( [ "openssl", "dgst", "-sha1", fileRoot + ".jar" ] , stdout=subprocess.PIPE ).communicate()
sha1 = p[0].split( ' ' )[1]
out = open( fileRoot + ".jar.sha1" , 'w' )
out.write( sha1 )
out.close()
Expand Down
11 changes: 8 additions & 3 deletions src/main/com/mongodb/DBPort.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,11 @@ boolean _open()

long sleepTime = 100;

long maxConnectionRetryTime = CONN_RETRY_TIME_MS;
if (_options.maxConnectionRetryTime > 0) {
maxConnectionRetryTime = _options.maxConnectionRetryTime;
}

final long start = System.currentTimeMillis();
while ( true ){

Expand Down Expand Up @@ -220,11 +225,11 @@ boolean _open()

long sleptSoFar = System.currentTimeMillis() - start;

if ( sleptSoFar >= CONN_RETRY_TIME_MS )
if ( sleptSoFar >= maxConnectionRetryTime )
throw lastError;

if ( sleepTime + sleptSoFar > CONN_RETRY_TIME_MS )
sleepTime = CONN_RETRY_TIME_MS - sleptSoFar;
if ( sleepTime + sleptSoFar > maxConnectionRetryTime )
sleepTime = maxConnectionRetryTime - sleptSoFar;

_logger.severe( "going to sleep and retry. total sleep time after = " + ( sleptSoFar + sleptSoFar ) + "ms this time:" + sleepTime + "ms" );
ThreadUtil.sleep( sleepTime );
Expand Down
7 changes: 7 additions & 0 deletions src/main/com/mongodb/MongoOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public void reset(){
maxWaitTime = 1000 * 60 * 2;
connectTimeout = 0;
socketTimeout = 0;
maxConnectionRetryTime = -1L;
socketKeepAlive = false;
autoConnectRetry = false;
slaveOk = false;
Expand Down Expand Up @@ -99,6 +100,12 @@ else if (safe)
*/
public int socketTimeout;

/**
* The maximum amount of time to spend retrying a connection. Used in DBPort.
* Any negative value (the default) will use DBPort's old default value of 15000.
*/
public long maxConnectionRetryTime;

/**
* This controls whether or not to have socket keep alive
* turned on (SO_KEEPALIVE).
Expand Down