review feedback

apache · Dec 18, 2018 · e83b160 · e83b160
1 parent 7b2d223
commit e83b160
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/core/src/main/scala/org/apache/spark/api/python/PythonGatewayServer.scala b/core/src/main/scala/org/apache/spark/api/python/PythonGatewayServer.scala
@@ -51,7 +51,7 @@ private[spark] object PythonGatewayServer extends Logging {
       builder.authToken(secret)
     } else {
       assert(sys.env.getOrElse("SPARK_TESTING", "0") == "1",
-        "Creating insecure java gateways only allowed for testing")
+        "Creating insecure Java gateways only allowed for testing")
     }
     val gatewayServer: GatewayServer = builder.build()
 

diff --git a/python/pyspark/context.py b/python/pyspark/context.py
@@ -115,11 +115,11 @@ def __init__(self, master=None, appName=None, sparkHome=None, pyFiles=None,
         if gateway is not None and gateway.gateway_parameters.auth_token is None:
             if conf and conf.get("spark.python.allowInsecurePy4j", "false") == "true":
                 warnings.warn(
-                    "You are passing in an insecure py4j gateway.  This "
+                    "You are passing in an insecure Py4j gateway.  This "
                     "presents a security risk, and will be completely forbidden in Spark 3.0")
             else:
                 raise Exception(
-                    "You are trying to pass an insecure py4j gateway to spark. This"
+                    "You are trying to pass an insecure Py4j gateway to Spark. This"
                     " presents a security risk.  If you are sure you understand and accept this"
                     " risk, you can add the conf 'spark.python.allowInsecurePy4j=true', but"
                     " note this option will be removed in Spark 3.0")

diff --git a/python/pyspark/java_gateway.py b/python/pyspark/java_gateway.py
@@ -41,7 +41,7 @@ def launch_gateway(conf=None):
     """
     launch jvm gateway
     :param conf: spark configuration passed to spark-submit
-    :return:
+    :return: a JVM gateway
     """
     return _launch_gateway(conf)
 
@@ -50,7 +50,7 @@ def _launch_gateway(conf=None, insecure=False):
     """
     launch jvm gateway
     :param conf: spark configuration passed to spark-submit
-    :return:
+    :return: a JVM gateway
     """
     if insecure and not os.environ.get("SPARK_TESTING", "0") == "1":
         raise Exception("creating insecure gateways is only for testing")

diff --git a/python/pyspark/tests.py b/python/pyspark/tests.py
@@ -2388,9 +2388,9 @@ def test_forbid_insecure_gateway(self):
         gateway = _launch_gateway(insecure=True)
         with self.assertRaises(Exception) as context:
             SparkContext(gateway=gateway)
-        self.assertIn("insecure py4j gateway", context.exception.message)
-        self.assertIn("spark.python.allowInsecurePy4j", context.exception.message)
-        self.assertIn("removed in Spark 3.0", context.exception.message)
+        self.assertIn("insecure Py4j gateway", str(context.exception))
+        self.assertIn("spark.python.allowInsecurePy4j", str(context.exception))
+        self.assertIn("removed in Spark 3.0", str(context.exception))
 
     def test_allow_insecure_gateway_with_conf(self):
         with SparkContext._lock:
@@ -2399,18 +2399,12 @@ def test_allow_insecure_gateway_with_conf(self):
         gateway = _launch_gateway(insecure=True)
         conf = SparkConf()
         conf.set("spark.python.allowInsecurePy4j", "true")
-        print("entering allow insecure test")
         with SparkContext(conf=conf, gateway=gateway) as sc:
             print("sc created, about to create accum")
             a = sc.accumulator(1)
             rdd = sc.parallelize([1, 2, 3])
-
-            def f(x):
-                a.add(x)
-
-            rdd.foreach(f)
+            rdd.foreach(lambda x: a.add(x))
             self.assertEqual(7, a.value)
-        print("exiting allow insecure test")
 
 
 class ConfTests(unittest.TestCase):