Nvmf Tier: keep alive timer constant Introduce new keep alive timer constant. For now we don't make this configurable since jNVMf does not allow to change it yet, i.e. it tells the target to use the default 2 minutes keep alive timer. We set it to 110 seconds to not miss the 2 minutes deadline.
Signed-off-by: Jonas Pfefferle <peppe...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/incubator-crail/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-crail/commit/6eb895c2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-crail/tree/6eb895c2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-crail/diff/6eb895c2 Branch: refs/heads/master Commit: 6eb895c2ea273bbe70f2cf51aed9b6323ea83ef7 Parents: fb01cdf Author: Jonas Pfefferle <peppe...@apache.org> Authored: Tue Apr 10 10:46:03 2018 +0200 Committer: Jonas Pfefferle <peppe...@apache.org> Committed: Tue Apr 10 13:19:03 2018 +0200 ---------------------------------------------------------------------- .../java/org/apache/crail/storage/nvmf/NvmfStorageClient.java | 4 +--- .../java/org/apache/crail/storage/nvmf/NvmfStorageConstants.java | 4 ++++ .../java/org/apache/crail/storage/nvmf/NvmfStorageServer.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/6eb895c2/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/NvmfStorageClient.java ---------------------------------------------------------------------- diff --git a/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/NvmfStorageClient.java b/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/NvmfStorageClient.java index cccf596..e352034 100644 --- a/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/NvmfStorageClient.java +++ b/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/NvmfStorageClient.java @@ -34,7 +34,6 @@ import java.io.IOException; import java.net.UnknownHostException; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.TimeUnit; public class NvmfStorageClient implements StorageClient { private static final Logger LOG = CrailUtils.getLogger(); @@ -60,9 +59,8 @@ public class NvmfStorageClient implements StorageClient { return; } } - /* We use the default keep alive timer of 120s in jNVMf */ try { - Thread.sleep(TimeUnit.MILLISECONDS.convert(110, TimeUnit.SECONDS)); + Thread.sleep(NvmfStorageConstants.KEEP_ALIVE_INTERVAL_MS); } catch (InterruptedException e) { return; } http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/6eb895c2/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/NvmfStorageConstants.java ---------------------------------------------------------------------- diff --git a/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/NvmfStorageConstants.java b/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/NvmfStorageConstants.java index 8ce132b..78b940b 100644 --- a/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/NvmfStorageConstants.java +++ b/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/NvmfStorageConstants.java @@ -29,6 +29,7 @@ import org.slf4j.Logger; import java.io.IOException; import java.net.InetAddress; import java.net.UnknownHostException; +import java.util.concurrent.TimeUnit; public class NvmfStorageConstants { @@ -55,6 +56,9 @@ public class NvmfStorageConstants { public static final String STAGING_CACHE_SIZE_KEY = "stagingcachesize"; public static int STAGING_CACHE_SIZE = 262144; + /* We use the default keep alive timer of 120s in jNVMf */ + public static long KEEP_ALIVE_INTERVAL_MS = TimeUnit.MILLISECONDS.convert(110, TimeUnit.SECONDS); + private static String fullKey(String key) { return PREFIX + "." + key; } http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/6eb895c2/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/NvmfStorageServer.java ---------------------------------------------------------------------- diff --git a/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/NvmfStorageServer.java b/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/NvmfStorageServer.java index b15cdc9..d41c406 100644 --- a/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/NvmfStorageServer.java +++ b/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/NvmfStorageServer.java @@ -88,7 +88,7 @@ public class NvmfStorageServer implements StorageServer { LOG.info("NnvmfStorageServer started with NVMf target " + getAddress()); while (isAlive) { try { - Thread.sleep(1000 /* ms */); + Thread.sleep(NvmfStorageConstants.KEEP_ALIVE_INTERVAL_MS); controller.keepAlive(); } catch (Exception e) { e.printStackTrace();
