[zeppelin] branch master updated: [ZEPPELIN-5460] Handling of hidden files while applying files under k8s mode

[pd...@apache.org]

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

pdallig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new 3ef292a  [ZEPPELIN-5460] Handling of hidden files while applying files under k8s mode
3ef292a is described below

commit 3ef292a05bfc6f5e0b7b784ee12fa4b702048e19
Author: rick <ri...@rickdeMacBook-Pro.local>
AuthorDate: Thu Jul 15 15:49:17 2021 +0800

    [ZEPPELIN-5460] Handling of hidden files while applying files under k8s mode
    
    ### What is this PR for?
    Currently, if there are some hidden files in the directory `k8s/interpreter`, zeppelin just outputs some logs `Skip {...}` but does not actually skip those hidden files. So if there are some odd files (e.g., `.DS_Store`), there will be some errors while applying them to k8s.
    
    ### What type of PR is it?
    [Bug Fix]
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * <https://issues.apache.org/jira/browse/ZEPPELIN-5460>
    
    ### How should this be tested?
    * CI pass and manually tested
    
    ### Screenshots (if appropriate)
    
    ### Questions:
    * Does the licenses files need update? No
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    Author: rick <ri...@rickdeMacBook-Pro.local>
    
    Closes #4177 from rickchengx/ZEPPELIN-5460 and squashes the following commits:
    
    3459d28d9 [rick] [ZEPPELIN-5460] Handling of hidden files while applying files under k8s mode
---
 .../zeppelin/interpreter/launcher/K8sRemoteInterpreterProcess.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zeppelin-plugins/launcher/k8s-standard/src/main/java/org/apache/zeppelin/interpreter/launcher/K8sRemoteInterpreterProcess.java b/zeppelin-plugins/launcher/k8s-standard/src/main/java/org/apache/zeppelin/interpreter/launcher/K8sRemoteInterpreterProcess.java
index 3711bee..19ff56f 100644
--- a/zeppelin-plugins/launcher/k8s-standard/src/main/java/org/apache/zeppelin/interpreter/launcher/K8sRemoteInterpreterProcess.java
+++ b/zeppelin-plugins/launcher/k8s-standard/src/main/java/org/apache/zeppelin/interpreter/launcher/K8sRemoteInterpreterProcess.java
@@ -241,6 +241,7 @@ public class K8sRemoteInterpreterProcess extends RemoteInterpreterManagedProcess
   void apply(File path, boolean delete, Properties templateProperties) throws IOException {
     if (path.getName().startsWith(".") || path.isHidden() || path.getName().endsWith("~")) {
       LOGGER.info("Skip {}", path.getAbsolutePath());
+      return;
     }
 
     if (path.isDirectory()) {