Author: cmccabe
Date: Tue Aug 12 23:03:06 2014
New Revision: 1617621
URL: http://svn.apache.org/r1617621
Log:
HADOOP-10962. Flags for posix_fadvise are not valid in some architectures
(David Villegas via Colin Patrick McCabe)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1617621&r1=1617620&r2=1617621&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Aug
12 23:03:06 2014
@@ -566,6 +566,9 @@ Release 2.6.0 - UNRELEASED
HADOOP-10851. NetgroupCache does not remove group memberships. (Benoy
Antony via Arpit Agarwal)
+ HADOOP-10962. Flags for posix_fadvise are not valid in some architectures
+ (David Villegas via Colin Patrick McCabe)
+
Release 2.5.0 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c?rev=1617621&r1=1617620&r2=1617621&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
Tue Aug 12 23:03:06 2014
@@ -172,6 +172,35 @@ static void nioe_deinit(JNIEnv *env) {
}
/*
+ * Compatibility mapping for fadvise flags. Return the proper value from
fnctl.h.
+ * If the value is not known, return the argument unchanged.
+ */
+static int map_fadvise_flag(jint flag) {
+ switch(flag) {
+ case org_apache_hadoop_io_nativeio_NativeIO_POSIX_POSIX_FADV_NORMAL:
+ return POSIX_FADV_NORMAL;
+ break;
+ case org_apache_hadoop_io_nativeio_NativeIO_POSIX_POSIX_FADV_RANDOM:
+ return POSIX_FADV_RANDOM;
+ break;
+ case org_apache_hadoop_io_nativeio_NativeIO_POSIX_POSIX_FADV_SEQUENTIAL:
+ return POSIX_FADV_SEQUENTIAL;
+ break;
+ case org_apache_hadoop_io_nativeio_NativeIO_POSIX_POSIX_FADV_WILLNEED:
+ return POSIX_FADV_WILLNEED;
+ break;
+ case org_apache_hadoop_io_nativeio_NativeIO_POSIX_POSIX_FADV_DONTNEED:
+ return POSIX_FADV_DONTNEED;
+ break;
+ case org_apache_hadoop_io_nativeio_NativeIO_POSIX_POSIX_FADV_NOREUSE:
+ return POSIX_FADV_NOREUSE;
+ break;
+ default:
+ return flag;
+ }
+}
+
+/*
* private static native void initNative();
*
* We rely on this function rather than lazy initialization because
@@ -303,7 +332,7 @@ Java_org_apache_hadoop_io_nativeio_Nativ
PASS_EXCEPTIONS(env);
int err = 0;
- if ((err = posix_fadvise(fd, (off_t)offset, (off_t)len, flags))) {
+ if ((err = posix_fadvise(fd, (off_t)offset, (off_t)len,
map_fadvise_flag(flags)))) {
#ifdef __FreeBSD__
throw_ioe(env, errno);
#else
