HADOOP-17209. Erasure Coding: Native library memory leak. Contributed by Sean Chow

S O'Donnell · S O'Donnell · commit 4163b43a83db · 2020-08-24T13:06:15.000+01:00
(cherry picked from commit 17cd8a1)
diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/erasurecode/jni_common.c b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/erasurecode/jni_common.c
@@ -92,6 +92,7 @@ void getInputs(JNIEnv *env, jobjectArray inputs, jintArray inputOffsets,
       destInputs[i] = NULL;
     }
   }
+  (*env)->ReleaseIntArrayElements(env, inputOffsets, tmpInputOffsets, 0);
 }
 
 void getOutputs(JNIEnv *env, jobjectArray outputs, jintArray outputOffsets,
@@ -112,4 +113,5 @@ void getOutputs(JNIEnv *env, jobjectArray outputs, jintArray outputOffsets,
                                                                   byteBuffer));
     destOutputs[i] += tmpOutputOffsets[i];
   }
-}
+  (*env)->ReleaseIntArrayElements(env, outputOffsets, tmpOutputOffsets, 0);
+}
diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/erasurecode/jni_rs_decoder.c b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/erasurecode/jni_rs_decoder.c
@@ -66,6 +66,7 @@ jintArray outputOffsets) {
 
   decode(&rsDecoder->decoder, rsDecoder->inputs, tmpErasedIndexes,
                            numErased, rsDecoder->outputs, chunkSize);
+  (*env)->ReleaseIntArrayElements(env, erasedIndexes, tmpErasedIndexes, 0);
 }
 
 JNIEXPORT void JNICALL

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ void getInputs(JNIEnv *env, jobjectArray inputs, jintArray inputOffsets,`
`92`	`92`	`destInputs[i] = NULL;`
`93`	`93`	`}`
`94`	`94`	`}`
	`95`	`+ (*env)->ReleaseIntArrayElements(env, inputOffsets, tmpInputOffsets, 0);`
`95`	`96`	`}`
`96`	`97`
`97`	`98`	`void getOutputs(JNIEnv *env, jobjectArray outputs, jintArray outputOffsets,`
`@@ -112,4 +113,5 @@ void getOutputs(JNIEnv *env, jobjectArray outputs, jintArray outputOffsets,`
`112`	`113`	`byteBuffer));`
`113`	`114`	`destOutputs[i] += tmpOutputOffsets[i];`
`114`	`115`	`}`
`115`		`-}`
	`116`	`+ (*env)->ReleaseIntArrayElements(env, outputOffsets, tmpOutputOffsets, 0);`
	`117`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ jintArray outputOffsets) {`
`66`	`66`
`67`	`67`	`decode(&rsDecoder->decoder, rsDecoder->inputs, tmpErasedIndexes,`
`68`	`68`	`numErased, rsDecoder->outputs, chunkSize);`
	`69`	`+ (*env)->ReleaseIntArrayElements(env, erasedIndexes, tmpErasedIndexes, 0);`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`JNIEXPORT void JNICALL`