NvmfStorageTier: fix to work with new jNVMf API Minor changes to work with latest jNVMf version.
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/b54e114b Tree: http://git-wip-us.apache.org/repos/asf/incubator-crail/tree/b54e114b Diff: http://git-wip-us.apache.org/repos/asf/incubator-crail/diff/b54e114b Branch: refs/heads/master Commit: b54e114bb180f28ba428d30b11f66f4b7e9919e4 Parents: 29be91d Author: Jonas Pfefferle <peppe...@apache.org> Authored: Wed Apr 4 16:32:01 2018 +0200 Committer: Jonas Pfefferle <peppe...@apache.org> Committed: Tue Apr 10 13:19:02 2018 +0200 ---------------------------------------------------------------------- .../apache/crail/storage/nvmf/NvmfStorageServer.java | 4 ++-- .../apache/crail/storage/nvmf/client/NvmfFuture.java | 2 +- .../storage/nvmf/client/NvmfStorageEndpoint.java | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/b54e114b/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 f8b0d8c..b15cdc9 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 @@ -70,8 +70,8 @@ public class NvmfStorageServer implements StorageServer { " at controller " + transportId.toString()); } IdentifyNamespaceData namespaceData = namespace.getIdentifyNamespaceData(); - LBAFormat lbaFormat = namespaceData.getFormattedLBASize(); - int dataSize = lbaFormat.getLBADataSize().toInt(); + LbaFormat lbaFormat = namespaceData.getFormattedLbaSize(); + int dataSize = lbaFormat.getLbaDataSize().toInt(); long namespaceSize = dataSize * namespaceData.getNamespaceCapacity(); alignedSize = namespaceSize - (namespaceSize % NvmfStorageConstants.ALLOCATION_SIZE); address = 0; http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/b54e114b/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/client/NvmfFuture.java ---------------------------------------------------------------------- diff --git a/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/client/NvmfFuture.java b/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/client/NvmfFuture.java index 0a6c9b4..639f568 100644 --- a/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/client/NvmfFuture.java +++ b/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/client/NvmfFuture.java @@ -29,7 +29,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -public class NvmfFuture<Command extends NvmIOCommand<? extends NvmIOCommandCapsule>> implements StorageFuture, OperationCallback { +public class NvmfFuture<Command extends NvmIoCommand<? extends NvmIoCommandCapsule>> implements StorageFuture, OperationCallback { private final NvmfStorageEndpoint endpoint; private final Command command; private final Queue<Command> operations; http://git-wip-us.apache.org/repos/asf/incubator-crail/blob/b54e114b/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/client/NvmfStorageEndpoint.java ---------------------------------------------------------------------- diff --git a/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/client/NvmfStorageEndpoint.java b/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/client/NvmfStorageEndpoint.java index e1430af..1661349 100644 --- a/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/client/NvmfStorageEndpoint.java +++ b/storage-nvmf/src/main/java/org/apache/crail/storage/nvmf/client/NvmfStorageEndpoint.java @@ -45,7 +45,7 @@ public class NvmfStorageEndpoint implements StorageEndpoint { private static final Logger LOG = CrailUtils.getLogger(); private final Controller controller; - private final IOQueuePair queuePair; + private final IoQueuePair queuePair; private final int lbaDataSize; private final long namespaceCapacity; private final NvmfRegisteredBufferCache registeredBufferCache; @@ -93,13 +93,13 @@ public class NvmfStorageEndpoint implements StorageEndpoint { " at controller " + transportId.toString()); } IdentifyNamespaceData identifyNamespaceData = namespace.getIdentifyNamespaceData(); - lbaDataSize = identifyNamespaceData.getFormattedLBASize().getLBADataSize().toInt(); + lbaDataSize = identifyNamespaceData.getFormattedLbaSize().getLbaDataSize().toInt(); if (CrailConstants.SLICE_SIZE % lbaDataSize != 0) { throw new IllegalArgumentException(CrailConstants.SLICE_SIZE_KEY + " is not a multiple of LBA data size (" + lbaDataSize + ")"); } namespaceCapacity = identifyNamespaceData.getNamespaceCapacity() * lbaDataSize; - this.queuePair = controller.createIOQueuePair(NvmfStorageConstants.QUEUE_SIZE, 0, 0, + this.queuePair = controller.createIoQueuePair(NvmfStorageConstants.QUEUE_SIZE, 0, 0, SubmissionQueueEntry.SIZE); this.writeCommands = new ArrayBlockingQueue<>(NvmfStorageConstants.QUEUE_SIZE); @@ -179,7 +179,7 @@ public class NvmfStorageEndpoint implements StorageEndpoint { } while (!tryGetOperation()); } - NvmIOCommand<? extends NvmIOCommandCapsule> command; + NvmIoCommand<? extends NvmIoCommandCapsule> command; NvmfFuture<?> future; Response<NvmResponseCapsule> response; if (op == Operation.READ) { @@ -196,16 +196,16 @@ public class NvmfStorageEndpoint implements StorageEndpoint { command.setCallback(future); response.setCallback(future); - NvmIOCommandSQE sqe = command.getCommandCapsule().getSubmissionQueueEntry(); + NvmIoCommandSqe sqe = command.getCommandCapsule().getSubmissionQueueEntry(); long startingLBA = startingAddress / getLBADataSize(); - sqe.setStartingLBA(startingLBA); + sqe.setStartingLba(startingLBA); /* TODO: on read this potentially overwrites data beyond the set limit */ short numLogicalBlocks = (short)(getNumLogicalBlocks(buffer) - 1); sqe.setNumberOfLogicalBlocks(numLogicalBlocks); KeyedNativeBuffer registeredBuffer = registeredBufferCache.get(buffer); registeredBuffer.position(buffer.position()); registeredBuffer.limit(registeredBuffer.position() + (numLogicalBlocks + 1) * getLBADataSize()); - command.getCommandCapsule().setSGLDescriptor(registeredBuffer); + command.getCommandCapsule().setSglDescriptor(registeredBuffer); command.execute(response);
