hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1126313 - in /hadoop/hdfs/branches/branch-0.22: ./ src/c++/libhdfs/ src/contrib/hdfsproxy/ src/java/ src/java/org/apache/hadoop/hdfs/server/datanode/ src/test/hdfs/ src/webapps/datanode/ src/webapps/hdfs/ src/webapps/secondary/
Date Mon, 23 May 2011 05:01:32 GMT
Author: eli
Date: Mon May 23 05:01:31 2011
New Revision: 1126313

URL: http://svn.apache.org/viewvc?rev=1126313&view=rev
Log:
HDFS-1978. svn merge -c 1126312 from trunk

Modified:
    hadoop/hdfs/branches/branch-0.22/   (props changed)
    hadoop/hdfs/branches/branch-0.22/CHANGES.txt
    hadoop/hdfs/branches/branch-0.22/build.xml   (props changed)
    hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/   (props changed)
    hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/hdfsJniHelper.c
    hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/   (props changed)
    hadoop/hdfs/branches/branch-0.22/src/java/   (props changed)
    hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java
  (props changed)
    hadoop/hdfs/branches/branch-0.22/src/test/hdfs/   (props changed)
    hadoop/hdfs/branches/branch-0.22/src/webapps/datanode/   (props changed)
    hadoop/hdfs/branches/branch-0.22/src/webapps/hdfs/   (props changed)
    hadoop/hdfs/branches/branch-0.22/src/webapps/secondary/   (props changed)

Propchange: hadoop/hdfs/branches/branch-0.22/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 05:01:31 2011
@@ -2,4 +2,4 @@
 /hadoop/core/branches/branch-0.19/hdfs:713112
 /hadoop/hdfs/branches/HDFS-265:796829-820463
 /hadoop/hdfs/branches/branch-0.21:820487
-/hadoop/hdfs/trunk:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987
+/hadoop/hdfs/trunk:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312

Modified: hadoop/hdfs/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/CHANGES.txt?rev=1126313&r1=1126312&r2=1126313&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.22/CHANGES.txt Mon May 23 05:01:31 2011
@@ -532,6 +532,8 @@ Release 0.22.0 - Unreleased
     HDFS-1932. Ensure that HDFS configuration deprecations are set up in every
     spot that HDFS configurations are loaded. (Jolly Chen via todd)
 
+    HDFS-1978. All but first option in LIBHDFS_OPTS is ignored. (eli)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

Propchange: hadoop/hdfs/branches/branch-0.22/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 05:01:31 2011
@@ -3,4 +3,4 @@
 /hadoop/core/trunk/build.xml:779102
 /hadoop/hdfs/branches/HDFS-265/build.xml:796829-820463
 /hadoop/hdfs/branches/branch-0.21/build.xml:820487
-/hadoop/hdfs/trunk/build.xml:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987
+/hadoop/hdfs/trunk/build.xml:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312

Propchange: hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 05:01:31 2011
@@ -1,4 +1,4 @@
 /hadoop/common/trunk/src/c++/libhdfs:1096645
 /hadoop/core/branches/branch-0.19/mapred/src/c++/libhdfs:713112
 /hadoop/core/trunk/src/c++/libhdfs:776175-784663
-/hadoop/hdfs/trunk/src/c++/libhdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987
+/hadoop/hdfs/trunk/src/c++/libhdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312

Modified: hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/hdfsJniHelper.c
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.22/src/c%2B%2B/libhdfs/hdfsJniHelper.c?rev=1126313&r1=1126312&r2=1126313&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/hdfsJniHelper.c (original)
+++ hadoop/hdfs/branches/branch-0.22/src/c++/libhdfs/hdfsJniHelper.c Mon May 23 05:01:31 2011
@@ -421,28 +421,35 @@ JNIEnv* getJNIEnv(void)
         snprintf(optHadoopClassPath, optHadoopClassPathLen,
                 "%s%s", hadoopClassPathVMArg, hadoopClassPath);
 
+        // Determine the # of LIBHDFS_OPTS args
         int noArgs = 1;
-        //determine how many arguments were passed as LIBHDFS_OPTS env var
         char *hadoopJvmArgs = getenv("LIBHDFS_OPTS");
         char jvmArgDelims[] = " ";
+        char *str, *token, *savePtr;
         if (hadoopJvmArgs != NULL)  {
-                char *result = NULL;
-                result = strtok( hadoopJvmArgs, jvmArgDelims );
-                while ( result != NULL ) {
-                        noArgs++;
-        		result = strtok( NULL, jvmArgDelims);
-           	}
+          hadoopJvmArgs = strdup(hadoopJvmArgs);
+          for (noArgs = 1, str = hadoopJvmArgs; ; noArgs++, str = NULL) {
+            token = strtok_r(str, jvmArgDelims, &savePtr);
+            if (NULL == token) {
+              break;
+            }
+          }
+          free(hadoopJvmArgs);
         }
+
+        // Now that we know the # args, populate the options array
         JavaVMOption options[noArgs];
         options[0].optionString = optHadoopClassPath;
-		//fill in any specified arguments
+        hadoopJvmArgs = getenv("LIBHDFS_OPTS");
 	if (hadoopJvmArgs != NULL)  {
-            char *result = NULL;
-            result = strtok( hadoopJvmArgs, jvmArgDelims );	
-            int argNum = 1;
-            for (;argNum < noArgs ; argNum++) {
-                options[argNum].optionString = result; //optHadoopArg;
+          hadoopJvmArgs = strdup(hadoopJvmArgs);
+          for (noArgs = 1, str = hadoopJvmArgs; ; noArgs++, str = NULL) {
+            token = strtok_r(str, jvmArgDelims, &savePtr);
+            if (NULL == token) {
+              break;
             }
+            options[noArgs].optionString = token;
+          }
         }
 
         //Create the VM
@@ -454,14 +461,18 @@ JNIEnv* getJNIEnv(void)
         vm_args.ignoreUnrecognized = 1;
 
         rv = JNI_CreateJavaVM(&vm, (void*)&env, &vm_args);
+
+        if (hadoopJvmArgs != NULL)  {
+          free(hadoopJvmArgs);
+        }
+        free(optHadoopClassPath);
+
         if (rv != 0) {
             fprintf(stderr, "Call to JNI_CreateJavaVM failed "
                     "with error: %d\n", rv);
             UNLOCK_JVM_MUTEX();
             return NULL;
         }
-
-        free(optHadoopClassPath);
     }
     else {
         //Attach this thread to the VM

Propchange: hadoop/hdfs/branches/branch-0.22/src/contrib/hdfsproxy/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 05:01:31 2011
@@ -3,4 +3,4 @@
 /hadoop/core/trunk/src/contrib/hdfsproxy:776175-784663
 /hadoop/hdfs/branches/HDFS-265/src/contrib/hdfsproxy:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy:820487
-/hadoop/hdfs/trunk/src/contrib/hdfsproxy:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987
+/hadoop/hdfs/trunk/src/contrib/hdfsproxy:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312

Propchange: hadoop/hdfs/branches/branch-0.22/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 05:01:31 2011
@@ -3,4 +3,4 @@
 /hadoop/core/trunk/src/hdfs:776175-785643,785929-786278
 /hadoop/hdfs/branches/HDFS-265/src/java:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/java:820487
-/hadoop/hdfs/trunk/src/java:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987
+/hadoop/hdfs/trunk/src/java:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312

Propchange: hadoop/hdfs/branches/branch-0.22/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 05:01:31 2011
@@ -5,4 +5,4 @@
 /hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:776175-785643,785929-786278
 /hadoop/hdfs/branches/HDFS-265/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:820487
-/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987
+/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312

Propchange: hadoop/hdfs/branches/branch-0.22/src/test/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 05:01:31 2011
@@ -3,4 +3,4 @@
 /hadoop/core/trunk/src/test/hdfs:776175-785643
 /hadoop/hdfs/branches/HDFS-265/src/test/hdfs:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/test/hdfs:820487
-/hadoop/hdfs/trunk/src/test/hdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987
+/hadoop/hdfs/trunk/src/test/hdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312

Propchange: hadoop/hdfs/branches/branch-0.22/src/webapps/datanode/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 05:01:31 2011
@@ -3,4 +3,4 @@
 /hadoop/core/trunk/src/webapps/datanode:776175-784663
 /hadoop/hdfs/branches/HDFS-265/src/webapps/datanode:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/webapps/datanode:820487
-/hadoop/hdfs/trunk/src/webapps/datanode:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987
+/hadoop/hdfs/trunk/src/webapps/datanode:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312

Propchange: hadoop/hdfs/branches/branch-0.22/src/webapps/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 05:01:31 2011
@@ -3,4 +3,4 @@
 /hadoop/core/trunk/src/webapps/hdfs:776175-784663
 /hadoop/hdfs/branches/HDFS-265/src/webapps/hdfs:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/webapps/hdfs:820487
-/hadoop/hdfs/trunk/src/webapps/hdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987
+/hadoop/hdfs/trunk/src/webapps/hdfs:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312

Propchange: hadoop/hdfs/branches/branch-0.22/src/webapps/secondary/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 05:01:31 2011
@@ -3,4 +3,4 @@
 /hadoop/core/trunk/src/webapps/secondary:776175-784663
 /hadoop/hdfs/branches/HDFS-265/src/webapps/secondary:796829-820463
 /hadoop/hdfs/branches/branch-0.21/src/webapps/secondary:820487
-/hadoop/hdfs/trunk/src/webapps/secondary:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987
+/hadoop/hdfs/trunk/src/webapps/secondary:1036213,1036303,1036310,1036631,1036767,1037047,1037109,1037961,1039957,1040005,1040411,1041190,1041261,1042067,1042069,1042517,1043301,1043308,1043314,1044102,1044218,1050109,1050125,1051134,1051334,1051603,1052169,1053203,1054807,1054858,1059508,1065860,1068725,1070025,1071023,1095235,1095245,1095830,1095963,1096645,1096647,1099972,1100054,1100279,1103920,1103987,1126312



Mime
View raw message