You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ga...@apache.org on 2020/05/18 17:36:16 UTC
[flink] branch master updated (b591f90 -> ed74173)
This is an automated email from the ASF dual-hosted git repository.
gary pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git.
from b591f90 [FLINK-17796] Respect user specified classpath for application mode
new be8c02e [FLINK-17687][tests] Enable listing files recursively by pattern
new 12d662c [FLINK-17687][tests] Collect log files before tearing down Mesos
new ed74173 [FLINK-17687][tests] Simplify collection of Mesos logs
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
flink-jepsen/src/jepsen/flink/mesos.clj | 5 ++++-
flink-jepsen/src/jepsen/flink/utils.clj | 7 ++++---
2 files changed, 8 insertions(+), 4 deletions(-)
[flink] 01/03: [FLINK-17687][tests] Enable listing files
recursively by pattern
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gary pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit be8c02e397943d668c4ff64e4c491a560136e2e1
Author: Gary Yao <ga...@apache.org>
AuthorDate: Thu May 14 17:10:35 2020 +0200
[FLINK-17687][tests] Enable listing files recursively by pattern
---
flink-jepsen/src/jepsen/flink/utils.clj | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/flink-jepsen/src/jepsen/flink/utils.clj b/flink-jepsen/src/jepsen/flink/utils.clj
index 5d8e712..39ee36c 100644
--- a/flink-jepsen/src/jepsen/flink/utils.clj
+++ b/flink-jepsen/src/jepsen/flink/utils.clj
@@ -58,16 +58,17 @@
(defn find-files!
"Lists files recursively given a directory. If the directory does not exist, an empty collection
is returned."
- [dir]
+ ([dir] (find-files! dir "*"))
+ ([dir name]
(let [files (try
- (c/exec :find dir :-type :f)
+ (c/exec :find dir :-type :f :-name (c/lit (str "\"" name "\"")))
(catch Exception e
(if (.contains (.getMessage e) "No such file or directory")
""
(throw e))))]
(->>
(clojure.string/split files #"\n")
- (remove clojure.string/blank?))))
+ (remove clojure.string/blank?)))))
;;; runit process supervisor (http://smarden.org/runit/)
[flink] 03/03: [FLINK-17687][tests] Simplify collection of Mesos
logs
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gary pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit ed74173c087fe879f5728b810e204bafb69bdae6
Author: Gary Yao <ga...@apache.org>
AuthorDate: Thu May 14 17:13:28 2020 +0200
[FLINK-17687][tests] Simplify collection of Mesos logs
This closes #12203.
---
flink-jepsen/src/jepsen/flink/mesos.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flink-jepsen/src/jepsen/flink/mesos.clj b/flink-jepsen/src/jepsen/flink/mesos.clj
index c104158..de1ba50 100644
--- a/flink-jepsen/src/jepsen/flink/mesos.clj
+++ b/flink-jepsen/src/jepsen/flink/mesos.clj
@@ -197,5 +197,5 @@
db/LogFiles
(log-files [_ test node]
(concat
- (if (cu/exists? log-dir) (cu/ls-full log-dir) [])
+ (fu/find-files! log-dir)
(fu/find-files! slave-dir "*.log")))))
[flink] 02/03: [FLINK-17687][tests] Collect log files before
tearing down Mesos
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gary pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 12d662c9da2dc3e18fdd3d752ddeeb07df1f5945
Author: Gary Yao <ga...@apache.org>
AuthorDate: Thu May 14 17:12:08 2020 +0200
[FLINK-17687][tests] Collect log files before tearing down Mesos
---
flink-jepsen/src/jepsen/flink/mesos.clj | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/flink-jepsen/src/jepsen/flink/mesos.clj b/flink-jepsen/src/jepsen/flink/mesos.clj
index e944089..c104158 100644
--- a/flink-jepsen/src/jepsen/flink/mesos.clj
+++ b/flink-jepsen/src/jepsen/flink/mesos.clj
@@ -22,6 +22,7 @@
[util :as util :refer [meh]]]
[jepsen.control.util :as cu]
[jepsen.os.debian :as debian]
+ [jepsen.flink.utils :as fu]
[jepsen.flink.utils :refer [create-supervised-service! stop-supervised-service!]]
[jepsen.flink.zookeeper :refer [zookeeper-uri]]))
@@ -195,4 +196,6 @@
(stop-marathon! test node))
db/LogFiles
(log-files [_ test node]
- (if (cu/exists? log-dir) (cu/ls-full log-dir) []))))
+ (concat
+ (if (cu/exists? log-dir) (cu/ls-full log-dir) [])
+ (fu/find-files! slave-dir "*.log")))))