Revision 6462
Added by Chris Jones over 13 years ago
src/edu/ucsb/nceas/metacat/dataone/hazelcast/HazelcastService.java | ||
---|---|---|
96 | 96 |
/* The Hazelcast distributed task id generator namespace */ |
97 | 97 |
private String taskIds; |
98 | 98 |
|
99 |
/* The Hazelcast distributed system metadata map */
|
|
99 |
/* The Hazelcast distributed node map */
|
|
100 | 100 |
private IMap<NodeReference, Node> nodes; |
101 | 101 |
|
102 | 102 |
/* The Hazelcast distributed system metadata map */ |
... | ... | |
174 | 174 |
PropertyService.getProperty("dataone.hazelcast.storageCluster.systemMetadataMap"); |
175 | 175 |
|
176 | 176 |
// Become a DataONE-process cluster client |
177 |
//TODO: where should this be? |
|
178 |
// String[] addresses = addressList.split(","); |
|
179 |
// hzClient = |
|
180 |
// HazelcastClient.newHazelcastClient(this.groupName, this.groupPassword, addresses); |
|
181 |
// nodes = hzClient.getMap(nodeMap); |
|
182 |
// pendingReplicationTasks = hzClient.getMap(pendingTasksQueue); |
|
177 |
String[] addresses = addressList.split(","); |
|
178 |
hzClient = |
|
179 |
HazelcastClient.newHazelcastClient(this.groupName, this.groupPassword, addresses); |
|
180 |
nodes = hzClient.getMap(nodeMap); |
|
183 | 181 |
|
184 | 182 |
// Get a reference to the shared system metadata map as a cluster member |
185 | 183 |
systemMetadata = Hazelcast.getMap(systemMetadataMap); |
... | ... | |
207 | 205 |
|
208 | 206 |
} |
209 | 207 |
|
208 |
/** |
|
209 |
* Get the system metadata map |
|
210 |
* |
|
211 |
* @return systemMetadata - the hazelcast map of system metadata |
|
212 |
*/ |
|
210 | 213 |
public IMap<Identifier,SystemMetadata> getSystemMetadataMap() { |
211 | 214 |
return systemMetadata; |
212 | 215 |
} |
213 | 216 |
|
214 |
public IMap<String,CNReplicationTask> getPendingReplicationTasks() { |
|
215 |
return pendingReplicationTasks; |
|
217 |
/** |
|
218 |
* Get the DataONE hazelcast node map |
|
219 |
* @return nodes - the hazelcast map of nodes |
|
220 |
*/ |
|
221 |
public IMap<NodeReference, Node> getNodesMap() { |
|
222 |
return nodes; |
|
216 | 223 |
} |
217 | 224 |
|
218 | 225 |
/** |
Also available in: Unified diff
Add getNodesMap() to return the hzNodes map from the process cluster. Remove getPendingReplicationTasks since that structure is being removed. Add minor documentation.