Repository: hive Updated Branches: refs/heads/master 38405c145 -> fe4bd0404
HIVE-18266: LLAP: /system references wrong file for THP (Prasanth Jayachandran reviewed by Sergey Shelukhin) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/fe4bd040 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/fe4bd040 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/fe4bd040 Branch: refs/heads/master Commit: fe4bd04044282af5711cc8c4e6cc6ebc237c8dca Parents: 38405c1 Author: Prasanth Jayachandran <[email protected]> Authored: Tue Dec 12 13:51:50 2017 -0800 Committer: Prasanth Jayachandran <[email protected]> Committed: Tue Dec 12 13:51:50 2017 -0800 ---------------------------------------------------------------------- .../daemon/services/impl/SystemConfigurationServlet.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/fe4bd040/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/services/impl/SystemConfigurationServlet.java ---------------------------------------------------------------------- diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/services/impl/SystemConfigurationServlet.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/services/impl/SystemConfigurationServlet.java index aab1248..1ff6e8d 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/services/impl/SystemConfigurationServlet.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/services/impl/SystemConfigurationServlet.java @@ -117,8 +117,10 @@ public class SystemConfigurationServlet extends HttpServlet { } if (!Shell.MAC) { - // Red Hat/CentOS: /sys/kernel/mm/redhat_transparent_hugepage/defrag - // Ubuntu/Debian, OEL, SLES: /sys/kernel/mm/transparent_hugepage/defrag + // Red Hat: /sys/kernel/mm/redhat_transparent_hugepage/enabled + // /sys/kernel/mm/redhat_transparent_hugepage/defrag + // CentOS/Ubuntu/Debian, OEL, SLES: /sys/kernel/mm/transparent_hugepage/enabled + // /sys/kernel/mm/transparent_hugepage/defrag String thpFileName = "/sys/kernel/mm/transparent_hugepage/enabled"; String thpFileStr = PrivilegedFileReader.read(thpFileName); if (thpFileStr == null) { @@ -136,11 +138,11 @@ public class SystemConfigurationServlet extends HttpServlet { LOG.warn("Unable to read contents of {}", thpFileName); } - String thpDefragFileName = "/sys/kernel/mm/transparent_hugepage/enabled"; + String thpDefragFileName = "/sys/kernel/mm/transparent_hugepage/defrag"; String thpDefragFileStr = PrivilegedFileReader.read(thpDefragFileName); if (thpDefragFileStr == null) { LOG.warn("Unable to read contents of {}", thpDefragFileName); - thpDefragFileName = "/sys/kernel/mm/redhat_transparent_hugepage/enabled"; + thpDefragFileName = "/sys/kernel/mm/redhat_transparent_hugepage/defrag"; thpDefragFileStr = PrivilegedFileReader.read(thpDefragFileName); }
