HIVE-29170: Restrict the Query History service from being modified at the session level

Author: abstractdog

common/src/java/org/apache/hadoop/hive/conf/HiveConf.java

@@ -5643,7 +5643,8 @@ public static enum ConfVars {
             "hive.zookeeper.ssl.truststore.type," +
             "hive.iceberg.allow.datafiles.in.table.location.only," +
             "hive.hook.proto.base-directory," +
-            "hive.rewrite.data.policy",
+            "hive.rewrite.data.policy," +
+            "hive.query.history.enabled", // Query History service is initialized on HS2 startup (HIVE-29170)
         "Comma separated list of configuration options which are immutable at runtime"),
     HIVE_CONF_HIDDEN_LIST("hive.conf.hidden.list",
         METASTORE_PWD.varname + "," + HIVE_SERVER2_SSL_KEYSTORE_PASSWORD.varname

itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestRestrictedList.java

@@ -112,6 +112,7 @@ public static void startServices() throws Exception {
     addToExpectedRestrictedMap("hive.iceberg.allow.datafiles.in.table.location.only");
     addToExpectedRestrictedMap("hive.hook.proto.base-directory");
     addToExpectedRestrictedMap("hive.rewrite.data.policy");
+    addToExpectedRestrictedMap("hive.query.history.enabled");
 
     checkRestrictedListMatch();
   }

ql/src/java/org/apache/hadoop/hive/ql/queryhistory/QueryHistoryService.java

@@ -127,7 +127,8 @@ public void start() {
 
   public static QueryHistoryService getInstance() {
     if (instance == null) {
-      throw new RuntimeException("QueryHistoryService is not present when asked for the singleton instance");
+      throw new RuntimeException("QueryHistoryService is not present when asked for the singleton instance. " +
+              "This is not expected to happen if 'hive.query.history.enabled' is properly set in the HS2 config. ");
     }
     return instance;
   }