[KYUUBI apache#856] Enhance Spark Block Cleaner loginfo

zwangsheng · ulysses-you · commit bf8de1a29b9a · 2021-07-22T11:52:41.000+08:00
### _Why are the changes needed?_ Enhacce Spark Block Cleaner loginfo * Unite timeunit * Remove period ### _How was this patch tested?_ - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible - [ ] Add screenshots for manual tests if appropriate - [X] [Run test](https://kyuubi.readthedocs.io/en/latest/tools/testing.html#running-tests) locally before make a pull request Closes apache#856 from zwangsheng/enhance/block-cleaner. Closes apache#856 c9b3fda [Binjie Yang] timeunit 124d156 [Binjie Yang] enhance spark block cleaner loginfo Authored-by: Binjie Yang <2213335496@qq.com> Signed-off-by: ulysses-you <ulyssesyou18@gmail.com>
diff --git a/tools/spark-block-cleaner/src/main/scala/org/apache/kyuubi/tools/KubernetesSparkBlockCleaner.scala b/tools/spark-block-cleaner/src/main/scala/org/apache/kyuubi/tools/KubernetesSparkBlockCleaner.scala
@@ -115,7 +115,7 @@ object KubernetesSparkBlockCleaner extends Logging {
           checkAndDeleteFile(blockManagerDir, time, true)
         }
         info(s"finished clean blockManager dir ${blockManagerDir.getCanonicalPath}, " +
-          s"released space: ${released.sum / 1024 / 1024} MB.")
+          s"released space: ${released.sum / 1024 / 1024} MB")
       }
 
     // clean spark cache file
@@ -126,7 +126,7 @@ object KubernetesSparkBlockCleaner extends Logging {
         // delete empty spark cache file
         checkAndDeleteFile(cacheDir, time, true)
         info(s"finished clean cache dir ${cacheDir.getCanonicalPath}, " +
-          s"released space: ${released.sum / 1024 / 1024} MB.")
+          s"released space: ${released.sum / 1024 / 1024} MB")
       }
   }
 
@@ -175,7 +175,7 @@ object KubernetesSparkBlockCleaner extends Logging {
       }
     }
     val finishedTime = System.currentTimeMillis()
-    info(s"clean job $dir finished, elapsed time: ${(finishedTime - startTime) / 1000} s.")
+    info(s"clean job $dir finished, elapsed time: ${(finishedTime - startTime) / 1000} s")
   }
 
   def main(args: Array[String]): Unit = {
@@ -192,7 +192,7 @@ object KubernetesSparkBlockCleaner extends Logging {
       hasFinished.await()
 
       val usedTime = System.currentTimeMillis() - startTime
-      info(s"finished to clean all dir, elapsed time $usedTime")
+      info(s"finished to clean all dir, elapsed time ${usedTime / 1000} s")
       if (usedTime > scheduleInterval) {
         warn(s"clean job elapsed time $usedTime which is greater than $scheduleInterval")
       } else {

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ object KubernetesSparkBlockCleaner extends Logging {`
`115`	`115`	`checkAndDeleteFile(blockManagerDir, time, true)`
`116`	`116`	`}`
`117`	`117`	`info(s"finished clean blockManager dir ${blockManagerDir.getCanonicalPath}, " +`
`118`		`- s"released space: ${released.sum / 1024 / 1024} MB.")`
	`118`	`+ s"released space: ${released.sum / 1024 / 1024} MB")`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`// clean spark cache file`
`@@ -126,7 +126,7 @@ object KubernetesSparkBlockCleaner extends Logging {`
`126`	`126`	`// delete empty spark cache file`
`127`	`127`	`checkAndDeleteFile(cacheDir, time, true)`
`128`	`128`	`info(s"finished clean cache dir ${cacheDir.getCanonicalPath}, " +`
`129`		`- s"released space: ${released.sum / 1024 / 1024} MB.")`
	`129`	`+ s"released space: ${released.sum / 1024 / 1024} MB")`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`
`@@ -175,7 +175,7 @@ object KubernetesSparkBlockCleaner extends Logging {`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`	`val finishedTime = System.currentTimeMillis()`
`178`		`- info(s"clean job $dir finished, elapsed time: ${(finishedTime - startTime) / 1000} s.")`
	`178`	`+ info(s"clean job $dir finished, elapsed time: ${(finishedTime - startTime) / 1000} s")`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`def main(args: Array[String]): Unit = {`
`@@ -192,7 +192,7 @@ object KubernetesSparkBlockCleaner extends Logging {`
`192`	`192`	`hasFinished.await()`
`193`	`193`
`194`	`194`	`val usedTime = System.currentTimeMillis() - startTime`
`195`		`- info(s"finished to clean all dir, elapsed time $usedTime")`
	`195`	`+ info(s"finished to clean all dir, elapsed time ${usedTime / 1000} s")`
`196`	`196`	`if (usedTime > scheduleInterval) {`
`197`	`197`	`warn(s"clean job elapsed time $usedTime which is greater than $scheduleInterval")`
`198`	`198`	`} else {`