Skip to content

Commit

Permalink
Changing name of storage properties from datanode to storage
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Stuedi committed Mar 27, 2017
1 parent 0fb034b commit 9630f5f
Show file tree
Hide file tree
Showing 13 changed files with 86 additions and 86 deletions.
10 changes: 5 additions & 5 deletions client/src/main/java/com/ibm/crail/conf/CrailConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ public class CrailConstants {
public static final String NAMENODE_DARPC_CLUSTERSIZE_KEY = "crail.namenode.darpc.clustersize";
public static int NAMENODE_DARPC_CLUSTERSIZE = 128;

public static final String DATANODE_TYPES_KEY = "crail.datanode.types";
public static String DATANODE_TYPES = "com.ibm.crail.storage.rdma.RdmaDataNode";
public static final String STORAGE_TYPES_KEY = "crail.storage.types";
public static String STORAGE_TYPES = "com.ibm.crail.storage.rdma.RdmaDataNode";

public static final String DIRECTORY_DEPTH_KEY = "crail.directory.depth";
public static int DIRECTORY_DEPTH = 16;
Expand Down Expand Up @@ -159,8 +159,8 @@ public static void updateConstants(CrailConfiguration conf){
if (conf.get(NAMENODE_DARPC_CLUSTERSIZE_KEY) != null) {
NAMENODE_DARPC_CLUSTERSIZE = Integer.parseInt(conf.get(NAMENODE_DARPC_CLUSTERSIZE_KEY));
}
if (conf.get(DATANODE_TYPES_KEY) != null) {
DATANODE_TYPES = conf.get(DATANODE_TYPES_KEY);
if (conf.get(STORAGE_TYPES_KEY) != null) {
STORAGE_TYPES = conf.get(STORAGE_TYPES_KEY);
}
if (conf.get(DIRECTORY_DEPTH_KEY) != null) {
DIRECTORY_DEPTH = Integer.parseInt(conf.get(DIRECTORY_DEPTH_KEY));
Expand Down Expand Up @@ -229,7 +229,7 @@ public static void printConf(){
LOG.info(NAMENODE_DARPC_SENDQUEUE_KEY + " " + NAMENODE_DARPC_SENDQUEUE);
LOG.info(NAMENODE_DARPC_POLLSIZE_KEY + " " + NAMENODE_DARPC_POLLSIZE);
LOG.info(NAMENODE_DARPC_CLUSTERSIZE_KEY + " " + NAMENODE_DARPC_CLUSTERSIZE);
LOG.info(DATANODE_TYPES_KEY + " " + DATANODE_TYPES);
LOG.info(STORAGE_TYPES_KEY + " " + STORAGE_TYPES);
LOG.info(DIRECTORY_DEPTH_KEY + " " + DIRECTORY_DEPTH);
LOG.info(TOKEN_EXPIRATION_KEY + " " + TOKEN_EXPIRATION);
LOG.info(BLOCK_SIZE_KEY + " " + BLOCK_SIZE);
Expand Down
2 changes: 1 addition & 1 deletion client/src/main/java/com/ibm/crail/core/CoreFileSystem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public CoreFileSystem(CrailConfiguration conf) throws Exception {
CrailConstants.verify();

//Datanodes
StringTokenizer tokenizer = new StringTokenizer(CrailConstants.DATANODE_TYPES, ",");
StringTokenizer tokenizer = new StringTokenizer(CrailConstants.STORAGE_TYPES, ",");
LinkedList<StorageTier> dataNodeClients = new LinkedList<StorageTier>();
while (tokenizer.hasMoreTokens()){
String name = tokenizer.nextToken();
Expand Down
2 changes: 1 addition & 1 deletion client/src/main/java/com/ibm/crail/storage/StorageTier.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public final synchronized void connect() throws Exception{
}

dataNodeTypes = new ConcurrentHashMap<String, Integer>();
StringTokenizer tokenizer = new StringTokenizer(CrailConstants.DATANODE_TYPES, ",");
StringTokenizer tokenizer = new StringTokenizer(CrailConstants.STORAGE_TYPES, ",");
int storageTier = 0;
while (tokenizer.hasMoreTokens()){
String name = tokenizer.nextToken();
Expand Down
2 changes: 1 addition & 1 deletion namenode/src/main/java/com/ibm/crail/namenode/BlockStore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class BlockStore {
private StorageTier[] storageTiers;

public BlockStore(){
StringTokenizer tokenizer = new StringTokenizer(CrailConstants.DATANODE_TYPES, ",");
StringTokenizer tokenizer = new StringTokenizer(CrailConstants.STORAGE_TYPES, ",");
storageTiers = new StorageTier[tokenizer.countTokens()];
for (int i = 0; i < tokenizer.countTokens(); i++){
this.storageTiers[i] = new StorageTier(i);
Expand Down
2 changes: 1 addition & 1 deletion storage-nvmf/src/main/java/com/ibm/crail/datanode/nvmf/NvmfStorageConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

public class NvmfStorageConstants {

private final static String PREFIX = "crail.datanode.nvmf";
private final static String PREFIX = "crail.storage.nvmf";

public static final String IP_ADDR_KEY = "bindip";
public static InetAddress IP_ADDR;
Expand Down
2 changes: 1 addition & 1 deletion storage-rdma/src/main/java/com/ibm/crail/storage/rdma/MrCache.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void put(IbvMr mr) throws IOException{
public void close() throws IOException {
for (Iterator<IbvMr> iter2 = device.values().iterator(); iter2.hasNext(); ){
IbvMr mr = iter2.next();
mr.deregMr();
mr.deregMr().free();
}
device.clear();
}
Expand Down
102 changes: 51 additions & 51 deletions storage-rdma/src/main/java/com/ibm/crail/storage/rdma/RdmaConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,84 +8,84 @@
import com.ibm.crail.conf.CrailConstants;

public class RdmaConstants {
public static final String DATANODE_RDMA_INTERFACE_KEY = "crail.datanode.rdma.interface";
public static String DATANODE_RDMA_INTERFACE = "eth5";
public static final String STORAGE_RDMA_INTERFACE_KEY = "crail.storage.rdma.interface";
public static String STORAGE_RDMA_INTERFACE = "eth5";

public static final String DATANODE_RDMA_PORT_KEY = "crail.datanode.rdma.port";
public static int DATANODE_RDMA_PORT = 50020;
public static final String STORAGE_RDMA_PORT_KEY = "crail.storage.rdma.port";
public static int STORAGE_RDMA_PORT = 50020;

public static final String DATANODE_RDMA_STORAGE_LIMIT_KEY = "crail.datanode.rdma.storagelimit";
public static long DATANODE_RDMA_STORAGE_LIMIT = 1073741824;
public static final String STORAGE_RDMA_STORAGE_LIMIT_KEY = "crail.storage.rdma.storagelimit";
public static long STORAGE_RDMA_STORAGE_LIMIT = 1073741824;

public static final String DATANODE_RDMA_ALLOCATION_SIZE_KEY = "crail.datanode.rdma.allocationsize";
public static long DATANODE_RDMA_ALLOCATION_SIZE = CrailConstants.REGION_SIZE;
public static final String STORAGE_RDMA_ALLOCATION_SIZE_KEY = "crail.storage.rdma.allocationsize";
public static long STORAGE_RDMA_ALLOCATION_SIZE = CrailConstants.REGION_SIZE;

public static final String DATANODE_RDMA_DATA_PATH_KEY = "crail.datanode.rdma.datapath";
public static String DATANODE_RDMA_DATA_PATH = "/home/stu/craildata/data";
public static final String STORAGE_RDMA_DATA_PATH_KEY = "crail.storage.rdma.datapath";
public static String STORAGE_RDMA_DATA_PATH = "/home/stu/craildata/data";

public static final String DATANODE_RDMA_INDEX_PATH_KEY = "crail.datanode.rdma.indexpath";
public static String DATANODE_RDMA_INDEX_PATH = "/home/stu/craildata/index";
public static final String STORAGE_RDMA_INDEX_PATH_KEY = "crail.storage.rdma.indexpath";
public static String STORAGE_RDMA_INDEX_PATH = "/home/stu/craildata/index";

public static final String DATANODE_RDMA_LOCAL_MAP_KEY = "crail.datanode.rdma.localmap";
public static boolean DATANODE_RDMA_LOCAL_MAP = true;
public static final String STORAGE_RDMA_LOCAL_MAP_KEY = "crail.storage.rdma.localmap";
public static boolean STORAGE_RDMA_LOCAL_MAP = true;

public static final String DATANODE_RDMA_QUEUESIZE_KEY = "crail.datanode.rdma.queuesize";
public static int DATANODE_RDMA_QUEUESIZE = 32;
public static final String STORAGE_RDMA_QUEUESIZE_KEY = "crail.storage.rdma.queuesize";
public static int STORAGE_RDMA_QUEUESIZE = 32;

public static final String DATANODE_RDMA_TYPE_KEY = "crail.datanode.rdma.type";
public static String DATANODE_RDMA_TYPE = "passive";
public static final String STORAGE_RDMA_TYPE_KEY = "crail.storage.rdma.type";
public static String STORAGE_RDMA_TYPE = "passive";

public static void updateConstants(CrailConfiguration conf){
if (conf.get(DATANODE_RDMA_INTERFACE_KEY) != null) {
DATANODE_RDMA_INTERFACE = conf.get(DATANODE_RDMA_INTERFACE_KEY);
if (conf.get(STORAGE_RDMA_INTERFACE_KEY) != null) {
STORAGE_RDMA_INTERFACE = conf.get(STORAGE_RDMA_INTERFACE_KEY);
}
if (conf.get(DATANODE_RDMA_PORT_KEY) != null) {
DATANODE_RDMA_PORT = Integer.parseInt(conf.get(DATANODE_RDMA_PORT_KEY));
if (conf.get(STORAGE_RDMA_PORT_KEY) != null) {
STORAGE_RDMA_PORT = Integer.parseInt(conf.get(STORAGE_RDMA_PORT_KEY));
}
if (conf.get(DATANODE_RDMA_STORAGE_LIMIT_KEY) != null) {
DATANODE_RDMA_STORAGE_LIMIT = Long.parseLong(conf.get(DATANODE_RDMA_STORAGE_LIMIT_KEY));
if (conf.get(STORAGE_RDMA_STORAGE_LIMIT_KEY) != null) {
STORAGE_RDMA_STORAGE_LIMIT = Long.parseLong(conf.get(STORAGE_RDMA_STORAGE_LIMIT_KEY));
}
if (conf.get(DATANODE_RDMA_ALLOCATION_SIZE_KEY) != null) {
DATANODE_RDMA_ALLOCATION_SIZE = Long.parseLong(conf.get(DATANODE_RDMA_ALLOCATION_SIZE_KEY));
if (conf.get(STORAGE_RDMA_ALLOCATION_SIZE_KEY) != null) {
STORAGE_RDMA_ALLOCATION_SIZE = Long.parseLong(conf.get(STORAGE_RDMA_ALLOCATION_SIZE_KEY));
}
if (conf.get(DATANODE_RDMA_DATA_PATH_KEY) != null) {
DATANODE_RDMA_DATA_PATH = conf.get(DATANODE_RDMA_DATA_PATH_KEY);
if (conf.get(STORAGE_RDMA_DATA_PATH_KEY) != null) {
STORAGE_RDMA_DATA_PATH = conf.get(STORAGE_RDMA_DATA_PATH_KEY);
}
if (conf.get(DATANODE_RDMA_INDEX_PATH_KEY) != null) {
DATANODE_RDMA_INDEX_PATH = conf.get(DATANODE_RDMA_INDEX_PATH_KEY);
if (conf.get(STORAGE_RDMA_INDEX_PATH_KEY) != null) {
STORAGE_RDMA_INDEX_PATH = conf.get(STORAGE_RDMA_INDEX_PATH_KEY);
}
if (conf.get(DATANODE_RDMA_LOCAL_MAP_KEY) != null) {
DATANODE_RDMA_LOCAL_MAP = conf.getBoolean(DATANODE_RDMA_LOCAL_MAP_KEY, false);
if (conf.get(STORAGE_RDMA_LOCAL_MAP_KEY) != null) {
STORAGE_RDMA_LOCAL_MAP = conf.getBoolean(STORAGE_RDMA_LOCAL_MAP_KEY, false);
}
if (conf.get(DATANODE_RDMA_QUEUESIZE_KEY) != null) {
DATANODE_RDMA_QUEUESIZE = Integer.parseInt(conf.get(DATANODE_RDMA_QUEUESIZE_KEY));
if (conf.get(STORAGE_RDMA_QUEUESIZE_KEY) != null) {
STORAGE_RDMA_QUEUESIZE = Integer.parseInt(conf.get(STORAGE_RDMA_QUEUESIZE_KEY));
}
if (conf.get(DATANODE_RDMA_TYPE_KEY) != null) {
DATANODE_RDMA_TYPE = conf.get(DATANODE_RDMA_TYPE_KEY);
if (conf.get(STORAGE_RDMA_TYPE_KEY) != null) {
STORAGE_RDMA_TYPE = conf.get(STORAGE_RDMA_TYPE_KEY);
}
}

public static void verify() throws IOException {
if (DATANODE_RDMA_ALLOCATION_SIZE % CrailConstants.BLOCK_SIZE != 0){
throw new IOException("crail.datanode.rdma.allocationsize must be multiple of crail.blocksize");
if (STORAGE_RDMA_ALLOCATION_SIZE % CrailConstants.BLOCK_SIZE != 0){
throw new IOException("crail.storage.rdma.allocationsize must be multiple of crail.blocksize");
}
if (DATANODE_RDMA_STORAGE_LIMIT % DATANODE_RDMA_ALLOCATION_SIZE != 0){
throw new IOException("crail.datanode.rdma.storageLimit must be multiple of crail.datanode.rdma.allocationSize");
if (STORAGE_RDMA_STORAGE_LIMIT % STORAGE_RDMA_ALLOCATION_SIZE != 0){
throw new IOException("crail.storage.rdma.storageLimit must be multiple of crail.storage.rdma.allocationSize");
}
if (!DATANODE_RDMA_TYPE.equalsIgnoreCase("passive") && !DATANODE_RDMA_TYPE.equalsIgnoreCase("active")){
throw new IOException("crail.datanode.type must be either <active> or <passive>, found " + DATANODE_RDMA_TYPE);
if (!STORAGE_RDMA_TYPE.equalsIgnoreCase("passive") && !STORAGE_RDMA_TYPE.equalsIgnoreCase("active")){
throw new IOException("crail.storage.rdma.type must be either <active> or <passive>, found " + STORAGE_RDMA_TYPE);
}
}

public static void printConf(Logger logger) {
logger.info(DATANODE_RDMA_INTERFACE_KEY + " " + DATANODE_RDMA_INTERFACE);
logger.info(DATANODE_RDMA_PORT_KEY + " " + DATANODE_RDMA_PORT);
logger.info(DATANODE_RDMA_STORAGE_LIMIT_KEY + " " + DATANODE_RDMA_STORAGE_LIMIT);
logger.info(DATANODE_RDMA_ALLOCATION_SIZE_KEY + " " + DATANODE_RDMA_ALLOCATION_SIZE);
logger.info(DATANODE_RDMA_DATA_PATH_KEY + " " + DATANODE_RDMA_DATA_PATH);
logger.info(DATANODE_RDMA_INDEX_PATH_KEY + " " + DATANODE_RDMA_INDEX_PATH);
logger.info(DATANODE_RDMA_LOCAL_MAP_KEY + " " + DATANODE_RDMA_LOCAL_MAP);
logger.info(DATANODE_RDMA_QUEUESIZE_KEY + " " + DATANODE_RDMA_QUEUESIZE);
logger.info(DATANODE_RDMA_TYPE_KEY + " " + DATANODE_RDMA_TYPE);
logger.info(STORAGE_RDMA_INTERFACE_KEY + " " + STORAGE_RDMA_INTERFACE);
logger.info(STORAGE_RDMA_PORT_KEY + " " + STORAGE_RDMA_PORT);
logger.info(STORAGE_RDMA_STORAGE_LIMIT_KEY + " " + STORAGE_RDMA_STORAGE_LIMIT);
logger.info(STORAGE_RDMA_ALLOCATION_SIZE_KEY + " " + STORAGE_RDMA_ALLOCATION_SIZE);
logger.info(STORAGE_RDMA_DATA_PATH_KEY + " " + STORAGE_RDMA_DATA_PATH);
logger.info(STORAGE_RDMA_INDEX_PATH_KEY + " " + STORAGE_RDMA_INDEX_PATH);
logger.info(STORAGE_RDMA_LOCAL_MAP_KEY + " " + STORAGE_RDMA_LOCAL_MAP);
logger.info(STORAGE_RDMA_QUEUESIZE_KEY + " " + STORAGE_RDMA_QUEUESIZE);
logger.info(STORAGE_RDMA_TYPE_KEY + " " + STORAGE_RDMA_TYPE);
}
}
32 changes: 16 additions & 16 deletions storage-rdma/src/main/java/com/ibm/crail/storage/rdma/RdmaStorageTier.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ public void init(CrailConfiguration conf, String[] args) throws IOException{
if ((char) ch == 'i') {
String ifname = go.optArgGet();
LOG.info("using custom interface " + ifname);
conf.set(RdmaConstants.DATANODE_RDMA_INTERFACE_KEY, ifname);
conf.set(RdmaConstants.STORAGE_RDMA_INTERFACE_KEY, ifname);
} else if ((char) ch == 'p') {
String port = go.optArgGet();
LOG.info("using custom port " + port);
conf.set(RdmaConstants.DATANODE_RDMA_PORT_KEY, port);
conf.set(RdmaConstants.STORAGE_RDMA_PORT_KEY, port);
}
}
}
Expand All @@ -106,14 +106,14 @@ public StorageEndpoint createEndpoint(InetSocketAddress inetAddress)
if (clientGroup == null){
synchronized(this){
if (clientGroup == null){
if (RdmaConstants.DATANODE_RDMA_TYPE.equalsIgnoreCase("passive")){
if (RdmaConstants.STORAGE_RDMA_TYPE.equalsIgnoreCase("passive")){
LOG.info("passive data client ");
RdmaStoragePassiveGroup _endpointGroup = new RdmaStoragePassiveGroup(100, RdmaConstants.DATANODE_RDMA_QUEUESIZE, 4, RdmaConstants.DATANODE_RDMA_QUEUESIZE*2, clientMrCache);
RdmaStoragePassiveGroup _endpointGroup = new RdmaStoragePassiveGroup(100, RdmaConstants.STORAGE_RDMA_QUEUESIZE, 4, RdmaConstants.STORAGE_RDMA_QUEUESIZE*2, clientMrCache);
_endpointGroup.init(new RdmaStoragePassiveEndpointFactory(_endpointGroup));
this.clientGroup = _endpointGroup;
} else {
LOG.info("active data client ");
RdmaStorageActiveGroup _endpointGroup = new RdmaStorageActiveGroup(100, false, RdmaConstants.DATANODE_RDMA_QUEUESIZE, 4, RdmaConstants.DATANODE_RDMA_QUEUESIZE*2, clientMrCache);
RdmaStorageActiveGroup _endpointGroup = new RdmaStorageActiveGroup(100, false, RdmaConstants.STORAGE_RDMA_QUEUESIZE, 4, RdmaConstants.STORAGE_RDMA_QUEUESIZE*2, clientMrCache);
_endpointGroup.init(new RdmaStorageActiveEndpointFactory(_endpointGroup));
this.clientGroup = _endpointGroup;
}
Expand All @@ -140,11 +140,11 @@ public InetSocketAddress getAddress() {
public void run () throws Exception {
this.serverAddr = getDataNodeAddress();
if (serverAddr == null){
LOG.info("Configured network interface " + RdmaConstants.DATANODE_RDMA_INTERFACE + " cannot be found..exiting!!!");
LOG.info("Configured network interface " + RdmaConstants.STORAGE_RDMA_INTERFACE + " cannot be found..exiting!!!");
return;
}
URI uri = URI.create("rdma://" + serverAddr.getAddress().getHostAddress() + ":" + serverAddr.getPort());
RdmaPassiveEndpointGroup<RdmaStorageServerEndpoint> datanodeGroup = new RdmaPassiveEndpointGroup<RdmaStorageServerEndpoint>(-1, RdmaConstants.DATANODE_RDMA_QUEUESIZE, 4, RdmaConstants.DATANODE_RDMA_QUEUESIZE*100);
RdmaPassiveEndpointGroup<RdmaStorageServerEndpoint> datanodeGroup = new RdmaPassiveEndpointGroup<RdmaStorageServerEndpoint>(-1, RdmaConstants.STORAGE_RDMA_QUEUESIZE, 4, RdmaConstants.STORAGE_RDMA_QUEUESIZE*100);
RdmaServerEndpoint<RdmaStorageServerEndpoint> datanodeServerEndpoint = datanodeGroup.createServerEndpoint();
RdmaStorageServer datanodeServer = new RdmaStorageServer(datanodeServerEndpoint, serverAddr);

Expand Down Expand Up @@ -189,14 +189,14 @@ public void run () throws Exception {
DataNodeStatistics statistics = this.getDataNode();
LOG.info("datanode statistics, freeBlocks " + statistics.getFreeBlockCount());

if (allocatedSize < RdmaConstants.DATANODE_RDMA_STORAGE_LIMIT){
if (allocatedSize < RdmaConstants.STORAGE_RDMA_STORAGE_LIMIT){
//mmap buffer
int fileId = fileCount++;
String dataFilePath = dataDirPath + "/" + fileId;
RandomAccessFile dataFile = new RandomAccessFile(dataFilePath, "rw");
dataFile.setLength(RdmaConstants.DATANODE_RDMA_ALLOCATION_SIZE);
dataFile.setLength(RdmaConstants.STORAGE_RDMA_ALLOCATION_SIZE);
FileChannel dataChannel = dataFile.getChannel();
ByteBuffer dataBuffer = dataChannel.map(MapMode.READ_WRITE, 0, RdmaConstants.DATANODE_RDMA_ALLOCATION_SIZE);
ByteBuffer dataBuffer = dataChannel.map(MapMode.READ_WRITE, 0, RdmaConstants.STORAGE_RDMA_ALLOCATION_SIZE);
dataFile.close();
dataChannel.close();

Expand Down Expand Up @@ -242,24 +242,24 @@ public void run () throws Exception {
public static String getDatanodeDirectory(InetSocketAddress inetAddress){
String address = inetAddress.getAddress().toString();
if (address.startsWith("/")){
return RdmaConstants.DATANODE_RDMA_DATA_PATH + address + "-" + inetAddress.getPort();
return RdmaConstants.STORAGE_RDMA_DATA_PATH + address + "-" + inetAddress.getPort();
} else {
return RdmaConstants.DATANODE_RDMA_DATA_PATH + address + "-" + inetAddress.getPort();
return RdmaConstants.STORAGE_RDMA_DATA_PATH + address + "-" + inetAddress.getPort();
}
}

public static String getIndexDirectory(InetSocketAddress inetAddress){
String address = inetAddress.getAddress().toString();
if (address.startsWith("/")){
return RdmaConstants.DATANODE_RDMA_INDEX_PATH + address + "-" + inetAddress.getPort();
return RdmaConstants.STORAGE_RDMA_INDEX_PATH + address + "-" + inetAddress.getPort();
} else {
return RdmaConstants.DATANODE_RDMA_INDEX_PATH + address + "-" + inetAddress.getPort();
return RdmaConstants.STORAGE_RDMA_INDEX_PATH + address + "-" + inetAddress.getPort();
}
}

public static InetSocketAddress getDataNodeAddress() throws Exception {
String ifname = RdmaConstants.DATANODE_RDMA_INTERFACE;
int port = RdmaConstants.DATANODE_RDMA_PORT;
String ifname = RdmaConstants.STORAGE_RDMA_INTERFACE;
int port = RdmaConstants.STORAGE_RDMA_PORT;

NetworkInterface netif = NetworkInterface.getByName(ifname);
if (netif == null){
Expand Down
4 changes: 2 additions & 2 deletions storage-rdma/src/main/java/com/ibm/crail/storage/rdma/client/RdmaStorageActiveEndpoint.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public RdmaStorageActiveEndpoint(RdmaStorageActiveGroup group, RdmaCmId id, bool
readOps = new LinkedBlockingQueue<SVCPostSend>();
this.opcount = new AtomicIntegerModulo();
this.futureMap = new ConcurrentHashMap<Long, RdmaActiveFuture>();
this.sendQueueAvailable = new Semaphore(RdmaConstants.DATANODE_RDMA_QUEUESIZE);
this.sendQueueAvailable = new Semaphore(RdmaConstants.STORAGE_RDMA_QUEUESIZE);
this.mrCache = group.getMrCache();
this.deviceCache = null;
}
Expand All @@ -67,7 +67,7 @@ public RdmaStorageActiveEndpoint(RdmaStorageActiveGroup group, RdmaCmId id, bool
protected synchronized void init() throws IOException {
super.init();

for (int i = 0; i < RdmaConstants.DATANODE_RDMA_QUEUESIZE; i++){
for (int i = 0; i < RdmaConstants.STORAGE_RDMA_QUEUESIZE; i++){
SVCPostSend write = initWriteOp();
writeOps.add(write);
SVCPostSend read = initReadOp();
Expand Down
2 changes: 1 addition & 1 deletion storage-rdma/src/main/java/com/ibm/crail/storage/rdma/client/RdmaStorageActiveGroup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public RdmaStorageActiveGroup(int timeout, boolean polling, int maxWR, int maxSg

// @Override
public StorageEndpoint createEndpoint(InetSocketAddress inetAddress) throws IOException {
if (localEndpoint != null && RdmaConstants.DATANODE_RDMA_LOCAL_MAP && CrailUtils.isLocalAddress(inetAddress.getAddress())){
if (localEndpoint != null && RdmaConstants.STORAGE_RDMA_LOCAL_MAP && CrailUtils.isLocalAddress(inetAddress.getAddress())){
return this.localEndpoint;
}
RdmaStorageActiveEndpoint endpoint = super.createEndpoint();
Expand Down
Loading

0 comments on commit 9630f5f

Please sign in to comment.