HBASE-28389 HBase backup yarn queue parameter ignored (#6131)

Signed-off-by: Duo Zhang <zhangduo@apache.org>
Signed-off-by: Nihal Jain <nihaljain@apache.org>
(cherry picked from commit 9dccc67)

hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java

@@ -124,8 +124,8 @@ private int parseAndRun() throws IOException {
 
     if (cmd.hasOption(OPTION_YARN_QUEUE_NAME)) {
       String queueName = cmd.getOptionValue(OPTION_YARN_QUEUE_NAME);
-      // Set system property value for MR job
-      System.setProperty("mapreduce.job.queuename", queueName);
+      // Set MR job queuename to configuration
+      getConf().set("mapreduce.job.queuename", queueName);
     }
 
     // parse main restore command options

hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupCommands.java

@@ -142,6 +142,12 @@ public void execute() throws IOException {
         throw new IOException(INCORRECT_USAGE);
       }
 
+      if (cmdline.hasOption(OPTION_YARN_QUEUE_NAME)) {
+        String queueName = cmdline.getOptionValue(OPTION_YARN_QUEUE_NAME);
+        // Set MR job queuename to configuration
+        getConf().set("mapreduce.job.queuename", queueName);
+      }
+
       // Create connection
       conn = ConnectionFactory.createConnection(getConf());
       if (requiresNoActiveSession()) {
@@ -333,12 +339,6 @@ public void execute() throws IOException {
 
       boolean ignoreChecksum = cmdline.hasOption(OPTION_IGNORECHECKSUM);
 
-      if (cmdline.hasOption(OPTION_YARN_QUEUE_NAME)) {
-        String queueName = cmdline.getOptionValue(OPTION_YARN_QUEUE_NAME);
-        // Set system property value for MR job
-        System.setProperty("mapreduce.job.queuename", queueName);
-      }
-
       try (BackupAdminImpl admin = new BackupAdminImpl(conn)) {
         BackupRequest.Builder builder = new BackupRequest.Builder();
         BackupRequest request = builder.withBackupType(BackupType.valueOf(args[1].toUpperCase()))