[YARN-2753] Fix potential issues and code clean up for *NodeLabelsManager

• Type: Sub-task
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Fix Version/s: 2.6.0
• Target Version/s: 2.6.0
• Hadoop Flags: Reviewed
• Assignee: Zhihai Xu
• Reporter: Zhihai Xu
• Created: 27/Oct/14 21:46
• Updated: 01/Dec/14 03:11
• Resolved: 07/Nov/14 22:19

Description

Issues include:

• CommonNodeLabelsManager#addToCluserNodeLabels should not change the value in labelCollections if the key already exists otherwise the Label.resource will be changed(reset).
• potential NPE(NullPointerException) in checkRemoveLabelsFromNode of CommonNodeLabelsManager.
  • because when a Node is created, Node.labels can be null.
  • In this case, nm.labels; may be null. So we need check originalLabels not null before use it(originalLabels.containsAll).
• addToCluserNodeLabels should be protected by writeLock in RMNodeLabelsManager.java. because we should protect labelCollections in RMNodeLabelsManager.
• Fix a potential bug in CommonsNodeLabelsManager, after serviceStop(...) is invoked, some event may not be processed, see comment

Issue Links

• is related to: YARN-2754 addToCluserNodeLabels should be protected by writeLock in RMNodeLabelsManager.java.
• is related to: YARN-2759 addToCluserNodeLabels should not change the value in labelCollections if the key already exists to avoid the Label.resource being reset.