PepperJo commented on a change in pull request #85:
URL: https://github.com/apache/incubator-crail/pull/85#discussion_r578452367
##########
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:
Sorry for the confusion I was not referring to killing a datanode. Is
this method always called first with `onlyMark=true` (e.g. prepare) and later
you remove or is there a case where one can "force" remove and call with
`onlyMark=false` directly?
I think given that this method does two different things we should split it
in a prepare and a remove method.
----------------------------------------------------------------
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:
us...@infra.apache.org
