NvmfStorageConstants: Allocation size integer Change allocationsize constant to be an integer. Since we do not support allocation sizes > MAXINT.
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/34e0af4e Tree: http://git-wip-us.apache.org/repos/asf/incubator-crail/tree/34e0af4e Diff: http://git-wip-us.apache.org/repos/asf/incubator-crail/diff/34e0af4e Branch: refs/heads/master Commit: 34e0af4ee0a1c246d91d67e2e0e1547f9ad43a70 Parents: a9162a2 Author: Jonas Pfefferle <peppe...@apache.org> Authored: Tue Apr 10 10:56:37 2018 +0200 Committer: Jonas Pfefferle <peppe...@apache.org> Committed: Tue Apr 10 13:19:03 2018 +0200 ---------------------------------------------------------------------- .../org/apache/crail/storage/nvmf/NvmfStorageConstants.java | 7 ++++--- .../java/org/apache/crail/storage/nvmf/NvmfStorageServer.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/34e0af4e/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 78b940b..56946c8 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 @@ -48,7 +48,7 @@ public class NvmfStorageConstants { public static NamespaceIdentifier NAMESPACE = new NamespaceIdentifier(1); public static final String ALLOCATION_SIZE_KEY = "allocationsize"; - public static long ALLOCATION_SIZE = 1073741824; /* 1GB */ + public static int ALLOCATION_SIZE = 1073741824; /* 1GB */ public static final String QUEUE_SIZE_KEY = "queueSize"; public static int QUEUE_SIZE = 64; @@ -85,7 +85,7 @@ public class NvmfStorageConstants { arg = get(conf, ALLOCATION_SIZE_KEY); if (arg != null) { - ALLOCATION_SIZE = Long.parseLong(arg); + ALLOCATION_SIZE = Integer.parseInt(arg); } arg = get(conf, QUEUE_SIZE_KEY); @@ -101,7 +101,8 @@ public class NvmfStorageConstants { public static void verify() { if (ALLOCATION_SIZE % CrailConstants.BLOCK_SIZE != 0){ - throw new IllegalArgumentException("allocationsize must be multiple of crail.blocksize"); + throw new IllegalArgumentException(fullKey(ALLOCATION_SIZE_KEY) + " (" + ALLOCATION_SIZE + + ") must be multiple of crail.blocksize (" + CrailConstants.BLOCK_SIZE + ")"); } if (QUEUE_SIZE < 0) { throw new IllegalArgumentException("Queue size negative"); http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/34e0af4e/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 d41c406..f632852 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 @@ -105,7 +105,7 @@ public class NvmfStorageServer implements StorageServer { LOG.info("new block, length " + NvmfStorageConstants.ALLOCATION_SIZE); LOG.debug("block stag 0, address " + address + ", length " + NvmfStorageConstants.ALLOCATION_SIZE); alignedSize -= NvmfStorageConstants.ALLOCATION_SIZE; - resource = StorageResource.createResource(address, (int)NvmfStorageConstants.ALLOCATION_SIZE, 0); + resource = StorageResource.createResource(address, NvmfStorageConstants.ALLOCATION_SIZE, 0); address += NvmfStorageConstants.ALLOCATION_SIZE; }
