Browse Source

HUE-4761 [spark] Little clean-up on indentation and logging warnings info

Romain Rigaux 9 years ago
parent
commit
2bfe4f7
1 changed files with 12 additions and 20 deletions
  1. 12 20
      desktop/libs/notebook/src/notebook/connectors/spark_shell.py

+ 12 - 20
desktop/libs/notebook/src/notebook/connectors/spark_shell.py

@@ -157,7 +157,7 @@ class SparkApi(Api):
     props = dict([(p['name'], p['value']) for p in properties]) if properties is not None else {}
 
 
-    # Hue's session request is causing Livy to fail with "JsonMappingException: Can not deserialize
+    # HUE-4761: Hue's session request is causing Livy to fail with "JsonMappingException: Can not deserialize
     # instance of scala.collection.immutable.List out of VALUE_STRING token" due to List type values
     # not being formed properly, they are quoted csv strings (without brackets) instead of proper List
     # types, this is for keys; archives, jars, files and pyFiles. The Mako frontend probably should be
@@ -168,31 +168,23 @@ class SparkApi(Api):
     # be increased for requests that take longer, for example when loading large archives.
     tmparchives = props['archives']
     if type(tmparchives) is not list:
-       listitems = tmparchives.split(",")
-       props['archives'] = listitems
-    else:
-      LOG.debug("Check List type: archives is already a list")
+      props['archives'] = tmparchives.split(",")
+      LOG.debug("Check List type: archives was not a list")
 
-    tmpjars =  props['jars']
+    tmpjars = props['jars']
     if type(tmpjars) is not list:
-       listitems = tmpjars.split(",")
-       props['jars'] = listitems
-    else:
-      LOG.debug("Check List type: jars is already a list")
+      props['jars'] = tmpjars.split(",")
+      LOG.debug("Check List type: jars was not a list")
 
-    tmpfiles =  props['files']
+    tmpfiles = props['files']
     if type(tmpfiles) is not list:
-       listitems = tmpfiles.split(",")
-       props['files'] = listitems
-    else:
-      LOG.debug("Check List type: files is already a list")
+      props['files'] = tmpfiles.split(",")
+      LOG.debug("Check List type: files was not a list")
 
-    tmppyFiles =  props['pyFiles']
+    tmppyFiles = props['pyFiles']
     if type(tmppyFiles) is not list:
-       listitems = tmppyFiles.split(",")
-       props['pyFiles'] = listitems
-    else:
-      LOG.debug("Check List type: pyFiles is already a list")
+      props['pyFiles'] = tmppyFiles.split(",")
+      LOG.debug("Check List type: pyFiles was not a list")
 
 
     props['kind'] = lang