Skip to content

Disconnect delay configurable #141

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

Merged
merged 2 commits into from
Oct 12, 2020
Merged

Disconnect delay configurable #141

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
0d17d7d
session disconnect delay configurable
nocvalight Sep 2, 2020
cd4da98
Merge branch 'master' into disconnect_delay_configurable
nocvalight Oct 12, 2020
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
20 changes: 20 additions & 0 deletions ...r/data/src/main/java/com/alipay/sofa/registry/server/data/bootstrap/DataServerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ public class DataServerConfig {

private int dataSyncNotifyRetry = 3;

private int sessionDisconnectDelayMs = 30000;

/**
* constructor
* @param commonConfig
Expand Down Expand Up @@ -848,6 +850,24 @@ public void setDataSyncNotifyRetry(int dataSyncNotifyRetry) {
this.dataSyncNotifyRetry = dataSyncNotifyRetry;
}

/**
* Getter method for property <tt>sessionDisconnectDelayMs</tt>.
*
* @return property value of sessionDisconnectDelayMs
*/
public int getSessionDisconnectDelayMs() {
return sessionDisconnectDelayMs;
}

/**
* Setter method for property <tt>sessionDisconnectDelayMs</tt>.
*
* @param sessionDisconnectDelayMs value to be assigned to property sessionDisconnectDelayMs
*/
public void setSessionDisconnectDelayMs(int sessionDisconnectDelayMs) {
this.sessionDisconnectDelayMs = sessionDisconnectDelayMs;
}

@Override
public String toString() {
return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
Expand Down
7 changes: 5 additions & 2 deletions ...ipay/sofa/registry/server/data/remoting/sessionserver/SessionServerConnectionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;

import com.alipay.sofa.registry.server.data.bootstrap.DataServerConfig;
import org.springframework.beans.factory.annotation.Autowired;

import com.alipay.remoting.Connection;
Expand All @@ -45,7 +46,6 @@ public class SessionServerConnectionFactory {
private static final Logger LOGGER = LoggerFactory
.getLogger(SessionServerConnectionFactory.class);

private static final int DELAY = 30 * 1000;
private static final Map EMPTY_MAP = new HashMap(0);

/**
Expand All @@ -69,6 +69,9 @@ public class SessionServerConnectionFactory {
@Autowired
private DisconnectEventHandler disconnectEventHandler;

@Autowired
private DataServerConfig dataServerConfig;

/**
* register connection
*
Expand Down Expand Up @@ -125,7 +128,7 @@ public void sessionDisconnected(String sessionConnAddress) {
// The SessionServerDisconnectEvent is triggered only when the last connection is broken
if (pair == null || pair.getConnections().isEmpty()) {
disconnectEventHandler.receive(new SessionServerDisconnectEvent(processId,
sessionConnAddress, DELAY));
sessionConnAddress, dataServerConfig.getSessionDisconnectDelayMs()));
}
}
}
Expand Down
1 change: 1 addition & 0 deletions server/server/data/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ data.server.metaServerPort=9611
data.server.storeNodes=3
data.server.numberOfReplicas=1000
data.server.datumTimeToLiveSec=900
data.server.sessionDisconnectDelayMs=30000