hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject hadoop git commit: HADOOP-11954. Solaris does not support RLIMIT_MEMLOCK as in Linux (Alan Burlison via aw)
Date Tue, 24 Nov 2015 20:48:09 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 15ecbc95b -> 38f8952c4


HADOOP-11954. Solaris does not support RLIMIT_MEMLOCK as in Linux (Alan Burlison via aw)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/38f8952c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/38f8952c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/38f8952c

Branch: refs/heads/branch-2
Commit: 38f8952c4da851d4d914e7594afd2287635a9876
Parents: 15ecbc9
Author: Allen Wittenauer <aw@apache.org>
Authored: Tue Nov 24 12:44:58 2015 -0800
Committer: Allen Wittenauer <aw@apache.org>
Committed: Tue Nov 24 12:48:02 2015 -0800

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt                | 3 +++
 .../main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c   | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/38f8952c/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 66b8870..2720943 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -735,6 +735,9 @@ Release 2.8.0 - UNRELEASED
     HADOOP-9822. Create constant MAX_CAPACITY in RetryCache rather than
     hard-coding 16 in RetryCache constructor. (Tsuyoshi Ozawa via wheat9)
 
+    HADOOP-11954. Solaris does not support RLIMIT_MEMLOCK as in Linux
+    (Alan Burlison via aw)
+
   OPTIMIZATIONS
 
     HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()

http://git-wip-us.apache.org/repos/asf/hadoop/blob/38f8952c/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
index bd7784e..a7d4b55 100644
--- a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
+++ b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
@@ -1255,9 +1255,7 @@ JNIEXPORT jlong JNICALL
 Java_org_apache_hadoop_io_nativeio_NativeIO_getMemlockLimit0(
 JNIEnv *env, jclass clazz)
 {
-#ifdef WINDOWS
-  return 0;
-#else
+#ifdef RLIMIT_MEMLOCK
   struct rlimit rlim;
   int rc = getrlimit(RLIMIT_MEMLOCK, &rlim);
   if (rc != 0) {
@@ -1266,6 +1264,8 @@ JNIEnv *env, jclass clazz)
   }
   return (rlim.rlim_cur == RLIM_INFINITY) ?
     INT64_MAX : rlim.rlim_cur;
+#else
+  return 0;
 #endif
 }
 


Mime
View raw message