Merge pull request #321 from Netflix/503Test

Remove unnecessary synchronized statements
Netflix · Jul 20, 2016 · f2f1ed4 · f2f1ed4
2 parents 1f3f631 + 69fa3f5
commit f2f1ed4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/genie-core/src/main/java/com/netflix/genie/core/services/impl/JobCountServiceImpl.java b/genie-core/src/main/java/com/netflix/genie/core/services/impl/JobCountServiceImpl.java
@@ -49,7 +49,7 @@ public JobCountServiceImpl(@NotNull final JobSearchService jobSearchService, @No
      * {@inheritDoc}
      */
     @Override
-    public synchronized int getNumJobs() {
+    public int getNumJobs() {
         return this.jobSearchService.getAllRunningJobExecutionsOnHost(this.hostName).size();
     }
 }
diff --git a/genie-web/src/main/java/com/netflix/genie/web/tasks/job/JobMonitoringCoordinator.java b/genie-web/src/main/java/com/netflix/genie/web/tasks/job/JobMonitoringCoordinator.java
@@ -201,7 +201,7 @@ public synchronized void onJobFinished(final JobFinishedEvent event) {
      *
      * @return the number of jobs currently running on this node
      */
-    public synchronized int getNumJobs() {
+    public int getNumJobs() {
         return this.jobMonitors.size() + this.scheduledJobs.size();
     }
 

diff --git a/...eb/src/test/java/com/netflix/genie/web/controllers/JobRestControllerIntegrationTests.java b/...eb/src/test/java/com/netflix/genie/web/controllers/JobRestControllerIntegrationTests.java
@@ -788,8 +788,9 @@ public void testSubmitJobMethodKillOnTimeout() throws Exception {
 
         if (result.getResponse().getStatus() != HttpStatus.ACCEPTED.value()) {
             log.error(
-                "RESPONSE WASN'T 202 IT WAS: {} AND THE MESSAGE IS: {}",
+                "RESPONSE WASN'T 202 IT WAS: {} AND THE ERROR MESSAGE IS: {} AND THE CONTENT IS {}",
                 result.getResponse().getStatus(),
+                result.getResponse().getErrorMessage(),
                 result.getResponse().getContentAsString()
             );
             Assert.fail();
@@ -858,8 +859,9 @@ public void testSubmitJobMethodFailure() throws Exception {
 
         if (result.getResponse().getStatus() != HttpStatus.ACCEPTED.value()) {
             log.error(
-                "RESPONSE WASN'T 202 IT WAS: {} AND THE MESSAGE IS: {}",
+                "RESPONSE WASN'T 202 IT WAS: {} AND THE ERROR MESSAGE IS: {} AND THE CONTENT IS {}",
                 result.getResponse().getStatus(),
+                result.getResponse().getErrorMessage(),
                 result.getResponse().getContentAsString()
             );
             Assert.fail();

diff --git a/genie-web/src/test/resources/application-ci.yml b/genie-web/src/test/resources/application-ci.yml
@@ -16,6 +16,10 @@
 #
 ##
 
+endpoints:
+  health:
+    time-to-live: 1
+
 genie:
   health:
     memory: