[VL] Add query id to fall-back log (#3919)

apache · Dec 5, 2023 · dfb985c · dfb985c
1 parent 144df96
commit dfb985c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/gluten-core/src/main/scala/org/apache/spark/sql/execution/GlutenFallbackReporter.scala b/gluten-core/src/main/scala/org/apache/spark/sql/execution/GlutenFallbackReporter.scala
@@ -47,7 +47,10 @@ case class GlutenFallbackReporter(glutenConfig: GlutenConfig, spark: SparkSessio
   }
 
   private def logFallbackReason(logLevel: String, nodeName: String, reason: String): Unit = {
-    logOnLevel(logLevel, s"Validation failed for plan: $nodeName, due to: $reason.")
+    val executionIdInfo = Option(spark.sparkContext.getLocalProperty(SQLExecution.EXECUTION_ID_KEY))
+      .map(id => s"[QueryId=$id]")
+      .getOrElse("")
+    logOnLevel(logLevel, s"Validation failed for plan: $nodeName$executionIdInfo, due to: $reason.")
   }
 
   private def printFallbackReason(plan: SparkPlan): Unit = {

diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/gluten/GlutenFallbackSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/gluten/GlutenFallbackSuite.scala
@@ -36,11 +36,9 @@ class GlutenFallbackSuite extends GlutenSQLTestsTrait {
           sql("SELECT * FROM t").collect()
         }
       }
-      assert(
-        testAppender.loggingEvents.exists(
-          _.getMessage.getFormattedMessage.contains(
-            "Validation failed for plan: Scan parquet default.t, " +
-              "due to: columnar FileScan is not enabled in FileSourceScanExec")))
+      val msgRegex = """Validation failed for plan: Scan parquet default\.t\[QueryId=[0-9]+\],""" +
+        """ due to: columnar FileScan is not enabled in FileSourceScanExec\."""
+      assert(testAppender.loggingEvents.exists(_.getMessage.getFormattedMessage.matches(msgRegex)))
     }
   }
 

diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/gluten/GlutenFallbackSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/gluten/GlutenFallbackSuite.scala
@@ -36,11 +36,9 @@ class GlutenFallbackSuite extends GlutenSQLTestsTrait {
           sql("SELECT * FROM t").collect()
         }
       }
-      assert(
-        testAppender.loggingEvents.exists(
-          _.getMessage.getFormattedMessage.contains(
-            "Validation failed for plan: Scan parquet default.t, " +
-              "due to: columnar FileScan is not enabled in FileSourceScanExec")))
+      val msgRegex = """Validation failed for plan: Scan parquet default\.t\[QueryId=[0-9]+\],""" +
+        """ due to: columnar FileScan is not enabled in FileSourceScanExec\."""
+      assert(testAppender.loggingEvents.exists(_.getMessage.getFormattedMessage.matches(msgRegex)))
     }
   }