import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
+import net.pterodactylus.fcp.highlevel.GetRequestResult;
import net.pterodactylus.fcp.highlevel.HighLevelCallback;
import net.pterodactylus.fcp.highlevel.HighLevelCallbackListener;
import net.pterodactylus.fcp.highlevel.HighLevelClient;
import net.pterodactylus.fcp.highlevel.HighLevelProgress;
import net.pterodactylus.fcp.highlevel.HighLevelProgressListener;
+import net.pterodactylus.fcp.highlevel.PutDirRequestResult;
+import net.pterodactylus.fcp.highlevel.PutRequestResult;
import net.pterodactylus.fcp.highlevel.RequestListResult;
import net.pterodactylus.fcp.highlevel.RequestResult;
+import net.pterodactylus.jsite.core.Request.Type;
import net.pterodactylus.util.logging.Logging;
/**
/** Request lists for all nodes. */
@SuppressWarnings("unused")
- private Map<Node, Set<Request>> nodeRequests = Collections.synchronizedMap(new HashMap<Node, Set<Request>>());
+ private Map<Node, Map<String, Request>> nodeRequests = Collections.synchronizedMap(new HashMap<Node, Map<String, Request>>());
//
// EVENT MANAGEMENT
/**
* Notifies all listeners that a request was added.
*
- * @param node
- * The node that added the request
* @param request
* The request that was added
*/
- private void fireRequestAdded(Node node, Request request) {
+ private void fireRequestAdded(Request request) {
for (RequestListener requestListener: requestListeners) {
- requestListener.requestAdded(node, request);
+ requestListener.requestAdded(request);
}
}
/**
* Notifies all listeners that a request progressed.
*
- * @param node
- * The node that runs the request
* @param request
* The request
- * @param totalBlocks
- * The total number of blocks
- * @param requiredBlocks
- * The number of required blocks
- * @param successfulBlocks
- * The number of successful blocks
- * @param failedBlocks
- * The number of failed blocks
- * @param fatallyFailedBlocks
- * The number of fatally failed blocks
- * @param finalizedTotal
- * <code>true</code> if the total number of blocks in final,
- * <code>false</code> otherwise
*/
- private void fireRequestProgressed(Node node, Request request, int totalBlocks, int requiredBlocks, int successfulBlocks, int failedBlocks, int fatallyFailedBlocks, boolean finalizedTotal) {
+ private void fireRequestProgressed(Request request) {
+ for (RequestListener requestListener: requestListeners) {
+ requestListener.requestProgressed(request);
+ }
+ }
+
+ /**
+ * Notifies all listeners that a request was removed.
+ *
+ * @param request
+ * The request that was removed
+ */
+ private void fireRequestRemoved(Request request) {
for (RequestListener requestListener: requestListeners) {
- requestListener.requestProgressed(node, request, totalBlocks, requiredBlocks, successfulBlocks, failedBlocks, fatallyFailedBlocks, finalizedTotal);
+ requestListener.requestRemoved(request);
}
}
* if an I/O error occurs while communicating with the node
*/
private void getRequests(final Node node) throws IOException {
- HighLevelClient highLevelClient = nodeManager.borrowHighLevelClient(node);
+ HighLevelClient highLevelClient = nodeManager.getHighLevelClient(node);
if (highLevelClient == null) {
logger.log(Level.WARNING, "no client for node: " + node);
return;
}
- try {
- HighLevelCallback<RequestListResult> requestListCallback = highLevelClient.getRequests();
- requestListCallback.addHighLevelCallbackListener(new HighLevelCallbackListener<RequestListResult>() {
+ final Map<String, Request> identifierRequests = Collections.synchronizedMap(new HashMap<String, Request>());
+ nodeRequests.put(node, identifierRequests);
+ HighLevelCallback<RequestListResult> requestListCallback = highLevelClient.getRequests();
+ requestListCallback.addHighLevelCallbackListener(new HighLevelCallbackListener<RequestListResult>() {
- @SuppressWarnings("synthetic-access")
- public void gotResult(HighLevelCallback<RequestListResult> highLevelCallback) {
- RequestListResult requestListResult;
- try {
- requestListResult = highLevelCallback.getResult();
- } catch (InterruptedException e) {
- logger.log(Level.SEVERE, "getResult() blocked and was interrupted");
- return;
- }
- for (RequestResult requestResult: requestListResult) {
- Request request = new Request(requestResult.getIdentifier());
- /* TODO - fill request */
- fireRequestAdded(node, request);
- }
+ @SuppressWarnings("synthetic-access")
+ public void gotResult(HighLevelCallback<RequestListResult> highLevelCallback) {
+ RequestListResult requestListResult;
+ try {
+ requestListResult = highLevelCallback.getResult();
+ } catch (InterruptedException e) {
+ logger.log(Level.SEVERE, "getResult() blocked and was interrupted");
+ return;
}
- });
- } finally {
- nodeManager.returnHighLevelClient(highLevelClient);
- }
+ for (RequestResult requestResult: requestListResult) {
+ String identifier = requestResult.getIdentifier();
+ logger.log(Level.FINER, "got identifier: " + identifier);
+ Request request = identifierRequests.get(identifier);
+ if (request == null) {
+ request = new Request(node, identifier);
+ }
+ if (request.getType() == null) {
+ if (requestResult instanceof GetRequestResult) {
+ request.setType(Type.get);
+ } else if (requestResult instanceof PutRequestResult) {
+ request.setType(Type.put);
+ } else if (requestResult instanceof PutDirRequestResult) {
+ request.setType(Type.putDir);
+ }
+ }
+ if (identifierRequests.containsKey(identifier)) {
+ continue;
+ }
+ identifierRequests.put(requestResult.getIdentifier(), request);
+ fireRequestAdded(request);
+ }
+ }
+ });
}
//
* {@inheritDoc}
*/
public void nodeAdded(Node node) {
- HighLevelClient highLevelClient = nodeManager.borrowHighLevelClient(node);
+ HighLevelClient highLevelClient = nodeManager.getHighLevelClient(node);
if (highLevelClient == null) {
+ logger.warning("got nodeAdded but no high-level client: " + node);
return;
}
- try {
- highLevelClient.addHighLevelProgressListener(this);
- } finally {
- nodeManager.returnHighLevelClient(highLevelClient);
- }
+ highLevelClient.addHighLevelProgressListener(this);
}
/**
* {@inheritDoc}
*/
public void nodeRemoved(Node node) {
- /* ignore. */
+ HighLevelClient highLevelClient = nodeManager.getHighLevelClient(node);
+ if (highLevelClient == null) {
+ logger.warning("got nodeRemoved but no high-level client: " + node);
+ return;
+ }
+ highLevelClient.removeHighLevelProgressListener(this);
}
/**
* {@inheritDoc}
*/
public void nodeConnected(Node node) {
- HighLevelClient highLevelClient = nodeManager.borrowHighLevelClient(node);
+ HighLevelClient highLevelClient = nodeManager.getHighLevelClient(node);
if (highLevelClient == null) {
logger.log(Level.WARNING, "got no high-level client for node " + node);
return;
}
try {
highLevelClient.setWatchGlobal(true);
- } catch (IOException ioe1) {
- /* ignore exception, disconnects are handled elsewhere. */
- } finally {
- nodeManager.returnHighLevelClient(highLevelClient);
- }
- try {
getRequests(node);
} catch (IOException e) {
/* ignore exception, disconnects are handled elsewhere. */
/**
* {@inheritDoc}
*/
+ public void nodeConnectionFailed(Node node, Throwable cause) {
+ /* we don't care about this. */
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public void nodeDisconnected(Node node, Throwable throwable) {
- /* TODO - remove all requests. */
+ Map<String, Request> identifierRequests = nodeRequests.get(node);
+ if (identifierRequests == null) {
+ logger.warning("got node without request map: " + node);
+ return;
+ }
+ for (Request request: identifierRequests.values()) {
+ fireRequestRemoved(request);
+ }
+ identifierRequests.clear();
}
//
//
/**
- * @see net.pterodactylus.fcp.highlevel.HighLevelProgressListener#progressReceived(java.lang.String,
- * net.pterodactylus.fcp.highlevel.HighLevelProgress)
+ * @see net.pterodactylus.fcp.highlevel.HighLevelProgressListener#progressReceived(HighLevelClient,
+ * String, HighLevelProgress)
*/
- public void progressReceived(String identifier, HighLevelProgress highLevelProgress) {
- fireRequestProgressed(null, new Request(identifier), highLevelProgress.getTotalBlocks(), highLevelProgress.getRequiredBlocks(), highLevelProgress.getSuccessfulBlocks(), highLevelProgress.getFailedBlocks(), highLevelProgress.getFatallyFailedBlocks(), highLevelProgress.isTotalFinalized());
+ public void progressReceived(HighLevelClient highLevelClient, String identifier, HighLevelProgress highLevelProgress) {
+ Node node = nodeManager.getNode(highLevelClient);
+ if (node == null) {
+ logger.warning("got high-level client without node: " + highLevelClient);
+ return;
+ }
+ Map<String, Request> identifierRequests = nodeRequests.get(node);
+ if (identifierRequests == null) {
+ logger.warning("got node without request map: " + node);
+ identifierRequests = Collections.synchronizedMap(new HashMap<String, Request>());
+ nodeRequests.put(node, identifierRequests);
+ }
+ Request request = identifierRequests.get(identifier);
+ if (request == null) {
+ logger.warning("got progress for unknown request: " + identifier);
+ request = new Request(node, identifier);
+ identifierRequests.put(identifier, request);
+ fireRequestAdded(request);
+ }
+ request.setTotalBlocks(highLevelProgress.getTotalBlocks());
+ request.setRequiredBlocks(highLevelProgress.getRequiredBlocks());
+ request.setSuccessfulBlocks(highLevelProgress.getSuccessfulBlocks());
+ request.setFailedBlocks(highLevelProgress.getFailedBlocks());
+ request.setFatallyFailedBlocks(highLevelProgress.getFatallyFailedBlocks());
+ request.setTotalFinalized(highLevelProgress.isTotalFinalized());
+ fireRequestProgressed(request);
}
}
projects / jSite2.git / blobdiff