METRON-1725: Add ability to specify YARN queue for pcap jobs

[merrimanr]

Contributor Comments

This PR exposes a configuration option in the Pcap CLI and REST app for the YARN queue a pcap job will be submitted to. This configuration is passed on to the mapreduce.job.queuename property in the Hadoop config. A YARN queue is set in the Pcap CLI with an additional command line option (-yq) and is set in the REST app as a spring property (pcap.yarn.queue).

Testing

This has been tested in full dev:

1. Create a YARN queue named pcap using the YARN Queue Manager
2. Ambari should prompt you, but be sure to restart the Resource Manager
3. Submit a job with the Pcap CLI and add the YARN queue option: -yq pcap
4. While the job is running navigate to the Resource Manager UI and verify the job is running in the pcap queue
5. Try to submit a job to a queue that doesn't exist. You should get a clear error stating the queue is missing
6. Go to Ambari > Services > Metron > REST and set the Metron Spring options property to --pcap.yarn.queue=pcap.
7. Ambari will prompt you to restart REST
8. Submit a job through the REST app and verify the job is running in the pcap queue
9. Submitting jobs in the Pcap CLI without the yq option and submitting jobs in REST without setting the pcap.yarn.queue should submit to the default queue.

Pull Request Checklist

Thank you for submitting a contribution to Apache Metron.
Please refer to our Development Guidelines for the complete guide to follow for contributions.
Please refer also to our Build Verification Guidelines for complete smoke testing guides.

In order to streamline the review of the contribution we ask you follow these guidelines and ask you to double check the following:

For all changes:

• Is there a JIRA ticket associated with this PR? If not one needs to be created at Metron Jira.
• Does your PR title start with METRON-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
• Has your PR been rebased against the latest commit within the target branch (typically master)?

For code changes:

• Have you included steps to reproduce the behavior or problem that is being changed or addressed?

• Have you included steps or a guide to how the change may be verified and tested manually?

• Have you ensured that the full suite of tests and checks have been executed in the root metron folder via:

  mvn -q clean integration-test install && dev-utilities/build-utils/verify_licenses.sh 
  

• Have you written or updated unit tests and or integration tests to verify your changes?

• If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?

• Have you verified the basic functionality of the build by building and running locally with Vagrant full-dev environment or the equivalent?

For documentation related changes:

• Have you ensured that format looks appropriate for the output in which it is rendered by building and verifying the site-book? If not then run the following commands and the verify changes via site-book/target/site/index.html:

  cd site-book
  mvn site
  

Note:

Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.
It is also recommended that travis-ci is set up for your personal repository such that your branches are built there before submitting a pull request.

[mmiklavc]

Should this be !(mapValue == null)?

Similarly stated:

if (itemValue == null ? mapValue == null : itemValue.equals(mapValue)) {
  return true;
}

If both values are null, it should return true, I would expect.

[merrimanr]

If any key/value pair doesn't match, they we want to return false. If all key/value pairs match, then we return true. With your change, true will be returned the first time a key/value pair matches and all others are skipped.

[mmiklavc]

@merrimanr, sorry I provided a bad example - I was just trying to rewrite the conditional in a different way with less "nots", rather than suggest that exact change. More precisely, this looks correct to me:

 if (itemValue != null ? !itemValue.equals(mapValue) : mapValue != null) {
...

as this will treat instances where BOTH values are null as equal.

[merrimanr]

Fixed

[mmiklavc]

Thanks for the PR @merrimanr! Any reason we wouldn't expose this option via Ambari while we're at it? We are already setting page size there as well.

[merrimanr]

Sure why not? I will add the Ambari changes.

[merrimanr]

The latest commit adds the YARN queue property to Ambari.

[mmiklavc]

lgtm, thanks @merrimanr. +1 via inspection.

[mmiklavc]

(pending Travis)