[YARN-10646] TestCapacitySchedulerWeightMode test descriptor comments doesn't reflect the correct scenario

• Type: Sub-task
• Status: Resolved
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 3.4.0
• Fix Version/s: 3.4.0
• Component/s: capacity scheduler
• Labels: pull-request-available
• Target Version/s: 3.4.0
• Hadoop Flags: Reviewed
• Assignee: Benjamin Teke
• Reporter: Benjamin Teke
• Created: 22/Feb/21 15:00
• Updated: 25/Jan/24 15:58
• Resolved: 08/Sep/21 14:11

Description

There is a mixup in TestCapacitySchedulerWeightMode in the configuration creator method comments and the test case descriptor comments. See the following code:

/*
   * Queue structure:
   *                      root (*)
   *                  _______________________
   *                 /                       \
   *               a x(=100%), y(50%)   b y(=50%), z(=100%)
   *               ________________             ______________
   *              /                           /              \
   *             a1 ([x,y]: w=100)    b1(no)          b2([y,z]: w=100)
   *
   * Parent uses weight, child uses percentage
   */
  public static Configuration getCSConfWithLabelsParentUsePctChildUseWeight(
      Configuration config) {

While inside the method all the queues (including the second level ones) are configured with capacity, only some labels are configured with weights:

    conf.setLabeledQueueWeight(CapacitySchedulerConfiguration.ROOT, "x", 100);
    conf.setLabeledQueueWeight(CapacitySchedulerConfiguration.ROOT, "y", 100);
    conf.setLabeledQueueWeight(CapacitySchedulerConfiguration.ROOT, "z", 100);

...

    conf.setQueues(A, new String[] { "a1" });
    conf.setCapacityByLabel(A1, RMNodeLabelsManager.NO_LABEL, 100);
    conf.setMaximumCapacity(A1, 100);
    conf.setAccessibleNodeLabels(A1, toSet("x", "y"));
    conf.setDefaultNodeLabelExpression(A1, "x");
    conf.setCapacityByLabel(A1, "x", 100);
    conf.setCapacityByLabel(A1, "y", 100);

    conf.setQueues(B, new String[] { "b1", "b2" });
    conf.setCapacityByLabel(B1, RMNodeLabelsManager.NO_LABEL, 50);
    conf.setMaximumCapacity(B1, 50);
    conf.setAccessibleNodeLabels(B1, RMNodeLabelsManager.EMPTY_STRING_SET);

    conf.setCapacityByLabel(B2, RMNodeLabelsManager.NO_LABEL, 50);
    conf.setMaximumCapacity(B2, 50);
    conf.setAccessibleNodeLabels(B2, toSet("y", "z"));
    conf.setCapacityByLabel(B2, "y", 100);
    conf.setCapacityByLabel(B2, "z", 100);

Issue Links

• links to: GitHub Pull Request #3339