mbrodmann commented on a change in pull request #85:
URL: https://github.com/apache/incubator-crail/pull/85#discussion_r578456721
##########
File path: namenode/src/main/java/org/apache/crail/namenode/BlockStore.java
##########
@@ -171,9 +192,33 @@ short addDataNode(DataNodeBlocks dataNode) {
return RpcErrors.ERR_OK;
}
-
+
+ short prepareForRemovalDatanode(DataNodeInfo dn) throws Exception {
+ // this will only mark it for removal
+ return prepareOrRemoveDN(dn, true);
+ }
+
+ short removeDatanode(DataNodeInfo dn) throws Exception {
+ // this will remove it as well
+ return prepareOrRemoveDN(dn, false);
+ }
+
//---------------
-
+
+ private short prepareOrRemoveDN(DataNodeInfo dn, boolean onlyMark)
throws Exception {
+ DataNodeBlocks toBeRemoved = membership.get(dn.key());
+ if (toBeRemoved == null) {
+ LOG.error("DataNode: " + dn.toString() + " not found");
+ return RpcErrors.ERR_DATANODE_NOT_REGISTERED;
+ } else {
+ if (onlyMark)
+ toBeRemoved.scheduleForRemoval();
+ else
+ membership.remove(toBeRemoved.key());
Review comment:
Thank you for clarifying. Yes, that is correct a datanode is always
marked first and removed afterwards when there are no remaining blocks (i.e.
there is no "force" case).
I agree splitting this into two methods would make things clearer and avoid
possible confusions. I will change it.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
