[incubator-livy] branch master updated: [LIVY-888] AddJar or AddFile call on a duplicate file should not result in failure for Livy session (#341)

[lmccay]

This is an automated email from the ASF dual-hosted git repository.

lmccay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-livy.git


The following commit(s) were added to refs/heads/master by this push:
     new 8d07eee8 [LIVY-888] AddJar or AddFile call on a duplicate file should 
not result in failure for Livy session (#341)
8d07eee8 is described below

commit 8d07eee831221093f55203190d38d793234c5db7
Author: Praneet Sharma <praneet10...@iiitd.ac.in>
AuthorDate: Mon Dec 26 21:33:54 2022 -0800

    [LIVY-888] AddJar or AddFile call on a duplicate file should not result in 
failure for Livy session (#341)
    
    * [LIVY-888] AddJar or AddFile call on a duplicate file should not result 
in failure for Livy session
---
 rsc/src/main/java/org/apache/livy/rsc/driver/RSCDriver.java | 5 +++--
 rsc/src/test/java/org/apache/livy/rsc/TestSparkClient.java  | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/rsc/src/main/java/org/apache/livy/rsc/driver/RSCDriver.java 
b/rsc/src/main/java/org/apache/livy/rsc/driver/RSCDriver.java
index 52af6d11..b93c5cc7 100644
--- a/rsc/src/main/java/org/apache/livy/rsc/driver/RSCDriver.java
+++ b/rsc/src/main/java/org/apache/livy/rsc/driver/RSCDriver.java
@@ -510,8 +510,9 @@ public class RSCDriver extends BaseProtocol {
     File localCopy = new File(localCopyDir, name);
 
     if (localCopy.exists()) {
-      throw new IOException(String.format("A file with name %s has " +
-              "already been uploaded.", name));
+      LOG.warn(String.format("A file with name %s has " +
+              "already been uploaded, and hence will not be replaced.", name));
+      return localCopy;
     }
     Configuration conf = sc.hadoopConfiguration();
     FileSystem fs = FileSystem.get(uri, conf);
diff --git a/rsc/src/test/java/org/apache/livy/rsc/TestSparkClient.java 
b/rsc/src/test/java/org/apache/livy/rsc/TestSparkClient.java
index 9fc50ece..6bf8f6ea 100644
--- a/rsc/src/test/java/org/apache/livy/rsc/TestSparkClient.java
+++ b/rsc/src/test/java/org/apache/livy/rsc/TestSparkClient.java
@@ -237,6 +237,11 @@ public class TestSparkClient {
           jarFile.closeEntry();
           jarFile.close();
 
+          client.addJar(new URI("file:" + jar.getAbsolutePath()))
+            .get(TIMEOUT, TimeUnit.SECONDS);
+
+          // Attempting to add a duplicate jar file to LivyClient. This add 
operation will be
+          // skipped and an appropriate warning logged
           client.addJar(new URI("file:" + jar.getAbsolutePath()))
             .get(TIMEOUT, TimeUnit.SECONDS);