Revision 6483
Added by Chris Jones over 13 years ago
| src/edu/ucsb/nceas/metacat/dataone/hazelcast/HazelcastService.java | ||
|---|---|---|
| 76 | 76 |
private Config hzConfig; |
| 77 | 77 |
|
| 78 | 78 |
/* The instance of the Hazelcast client */ |
| 79 |
private HazelcastClient hzClient; |
|
| 79 |
// private HazelcastClient hzClient;
|
|
| 80 | 80 |
|
| 81 | 81 |
/* The name of the DataONE Hazelcast cluster group */ |
| 82 | 82 |
private String groupName; |
| ... | ... | |
| 164 | 164 |
PropertyService.getProperty("dataone.hazelcast.processCluster.password");
|
| 165 | 165 |
addressList = |
| 166 | 166 |
PropertyService.getProperty("dataone.hazelcast.processCluster.instances");
|
| 167 |
nodeMap = |
|
| 168 |
PropertyService.getProperty("dataone.hazelcast.processCluster.nodesMap");
|
|
| 167 |
// nodeMap =
|
|
| 168 |
// PropertyService.getProperty("dataone.hazelcast.processCluster.nodesMap");
|
|
| 169 | 169 |
systemMetadataMap = |
| 170 | 170 |
PropertyService.getProperty("dataone.hazelcast.storageCluster.systemMetadataMap");
|
| 171 | 171 |
|
| 172 | 172 |
// Become a DataONE-process cluster client |
| 173 |
String[] addresses = addressList.split(",");
|
|
| 174 |
hzClient = |
|
| 175 |
HazelcastClient.newHazelcastClient(this.groupName, this.groupPassword, addresses); |
|
| 176 |
nodes = hzClient.getMap(nodeMap); |
|
| 173 |
// String[] addresses = addressList.split(",");
|
|
| 174 |
// hzClient =
|
|
| 175 |
// HazelcastClient.newHazelcastClient(this.groupName, this.groupPassword, addresses);
|
|
| 176 |
// nodes = hzClient.getMap(nodeMap);
|
|
| 177 | 177 |
|
| 178 | 178 |
// Get a reference to the shared system metadata map as a cluster member |
| 179 | 179 |
systemMetadata = Hazelcast.getMap(systemMetadataMap); |
| ... | ... | |
| 214 | 214 |
* Get the DataONE hazelcast node map |
| 215 | 215 |
* @return nodes - the hazelcast map of nodes |
| 216 | 216 |
*/ |
| 217 |
public IMap<NodeReference, Node> getNodesMap() {
|
|
| 218 |
return nodes; |
|
| 219 |
} |
|
| 217 |
// public IMap<NodeReference, Node> getNodesMap() {
|
|
| 218 |
// return nodes;
|
|
| 219 |
// }
|
|
| 220 | 220 |
|
| 221 | 221 |
/** |
| 222 | 222 |
* Indicate whether or not this service is refreshable. |
Also available in: Unified diff
For now, remove the hzClient code connecting to the DataONE process cluster to get the hzNodes map. This will be moved into the storage cluster, but use D1Client to get the node list for now.