From db35fd19441439df7bddd3d4e9599d43f57137a5 Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Wed, 2 Jul 2014 09:42:16 +0900 Subject: [PATCH 1/4] Fix results.json only contains result of last test. --- toolset/benchmark/benchmarker.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/toolset/benchmark/benchmarker.py b/toolset/benchmark/benchmarker.py index 95949a2246e..e1c0e59c76b 100644 --- a/toolset/benchmark/benchmarker.py +++ b/toolset/benchmark/benchmarker.py @@ -490,6 +490,7 @@ def __run_tests(self, tests): test_process = Process(target=self.__run_test, args=(test,)) test_process.start() test_process.join(self.run_test_timeout_seconds) + self.__load_results() # Load intermediate result from child process if(test_process.is_alive()): logging.debug("Child process for {name} is still alive. Terminating.".format(name=test.name)) self.__write_intermediate_results(test.name,"__run_test timeout (="+ str(self.run_test_timeout_seconds) + " seconds)") @@ -571,7 +572,7 @@ def __run_test(self, test): p.communicate(""" sudo restart mysql sudo restart mongodb - sudo /etc/init.d/postgresql restart + sudo /etc/init.d/postgresql restart """) time.sleep(10) @@ -828,6 +829,15 @@ def __write_intermediate_results(self,test_name,status_message): # End __write_intermediate_results ############################################################ + def __load_results(self): + try: + with open(os.path.join(self.latest_results_directory, 'results.json')) as f: + results = json.load(f) + except ValueError, IOError: + pass + else: + self.results = results + ############################################################ # __finish ############################################################ From 025ca7b77aff86d079f00ba047200b8baf53dc51 Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Wed, 2 Jul 2014 19:19:55 +0900 Subject: [PATCH 2/4] Fix old Python syntax. --- toolset/benchmark/benchmarker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolset/benchmark/benchmarker.py b/toolset/benchmark/benchmarker.py index e1c0e59c76b..e967c6ee126 100644 --- a/toolset/benchmark/benchmarker.py +++ b/toolset/benchmark/benchmarker.py @@ -833,7 +833,7 @@ def __load_results(self): try: with open(os.path.join(self.latest_results_directory, 'results.json')) as f: results = json.load(f) - except ValueError, IOError: + except (ValueError, IOError): pass else: self.results = results From ed48e17769b4c1a8080b85504100d249120f2b6a Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Fri, 11 Jul 2014 16:40:11 +0900 Subject: [PATCH 3/4] refactoring. --- .../com`example/helloworld/db/WorldDAO.java | 22 +++++++++++++++++++ toolset/benchmark/benchmarker.py | 4 +--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 dropwizard/src/main/java/com`example/helloworld/db/WorldDAO.java diff --git a/dropwizard/src/main/java/com`example/helloworld/db/WorldDAO.java b/dropwizard/src/main/java/com`example/helloworld/db/WorldDAO.java new file mode 100644 index 00000000000..d519ecdc933 --- /dev/null +++ b/dropwizard/src/main/java/com`example/helloworld/db/WorldDAO.java @@ -0,0 +1,22 @@ + +package com.example.helloworld.db; + +import org.hibernate.SessionFactory; + +import com.example.helloworld.core.World; +import com.google.common.base.Optional; +import com.yammer.dropwizard.hibernate.AbstractDAO; + +public class WorldDAO + extends AbstractDAO +{ + public WorldDAO(SessionFactory factory) + { + super(factory); + } + + public Optional findById(Long id) + { + return Optional.fromNullable(get(id)); + } +} diff --git a/toolset/benchmark/benchmarker.py b/toolset/benchmark/benchmarker.py index e967c6ee126..8087f529ca5 100644 --- a/toolset/benchmark/benchmarker.py +++ b/toolset/benchmark/benchmarker.py @@ -832,11 +832,9 @@ def __write_intermediate_results(self,test_name,status_message): def __load_results(self): try: with open(os.path.join(self.latest_results_directory, 'results.json')) as f: - results = json.load(f) + self.results = json.load(f) except (ValueError, IOError): pass - else: - self.results = results ############################################################ # __finish From 199a90114553a1883094738aadcbafc1948729f6 Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Fri, 11 Jul 2014 16:42:59 +0900 Subject: [PATCH 4/4] Delete miscommitted file. --- .../com`example/helloworld/db/WorldDAO.java | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 dropwizard/src/main/java/com`example/helloworld/db/WorldDAO.java diff --git a/dropwizard/src/main/java/com`example/helloworld/db/WorldDAO.java b/dropwizard/src/main/java/com`example/helloworld/db/WorldDAO.java deleted file mode 100644 index d519ecdc933..00000000000 --- a/dropwizard/src/main/java/com`example/helloworld/db/WorldDAO.java +++ /dev/null @@ -1,22 +0,0 @@ - -package com.example.helloworld.db; - -import org.hibernate.SessionFactory; - -import com.example.helloworld.core.World; -import com.google.common.base.Optional; -import com.yammer.dropwizard.hibernate.AbstractDAO; - -public class WorldDAO - extends AbstractDAO -{ - public WorldDAO(SessionFactory factory) - { - super(factory); - } - - public Optional findById(Long id) - { - return Optional.fromNullable(get(id)); - } -}