aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kevi...@apache.org
Subject git commit: Drop syncrhonized from JobUpdateEventSubscriber
Date Wed, 08 Oct 2014 19:07:01 GMT
Repository: incubator-aurora
Updated Branches:
  refs/heads/master f2f0ed861 -> 9359a3eb7


Drop syncrhonized from JobUpdateEventSubscriber

This fixes a startup deadlock.

Testing Done:
./gradlew -Pq build

Manually verified that all delegated calls to the JobUpdateController
are already protected by the storage write-lock.

Rather than add a potentially-flaky regression test (like
the one added in https://reviews.apache.org/r/25556/)
I'd prefer to prioritize adding runtime deadlock detection
(https://issues.apache.org/jira/browse/AURORA-800).

Bugs closed: AURORA-801

Reviewed at https://reviews.apache.org/r/26422/


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/9359a3eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/9359a3eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/9359a3eb

Branch: refs/heads/master
Commit: 9359a3eb73b6a759cb1928f7fd3175daadc7557f
Parents: f2f0ed8
Author: Kevin Sweeney <kevints@apache.org>
Authored: Wed Oct 8 12:06:23 2014 -0700
Committer: Kevin Sweeney <kevints@apache.org>
Committed: Wed Oct 8 12:06:23 2014 -0700

----------------------------------------------------------------------
 .../aurora/scheduler/updater/JobUpdateEventSubscriber.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/9359a3eb/src/main/java/org/apache/aurora/scheduler/updater/JobUpdateEventSubscriber.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/updater/JobUpdateEventSubscriber.java
b/src/main/java/org/apache/aurora/scheduler/updater/JobUpdateEventSubscriber.java
index 49d8b7a..463a3aa 100644
--- a/src/main/java/org/apache/aurora/scheduler/updater/JobUpdateEventSubscriber.java
+++ b/src/main/java/org/apache/aurora/scheduler/updater/JobUpdateEventSubscriber.java
@@ -50,7 +50,7 @@ class JobUpdateEventSubscriber implements PubsubEvent.EventSubscriber {
   }
 
   @Subscribe
-  public synchronized void taskChangedState(TaskStateChange change) {
+  public void taskChangedState(TaskStateChange change) {
     try {
       controller.instanceChangedState(change.getTask());
     } catch (RuntimeException e) {
@@ -60,7 +60,7 @@ class JobUpdateEventSubscriber implements PubsubEvent.EventSubscriber {
   }
 
   @Subscribe
-  public synchronized void tasksDeleted(TasksDeleted event) {
+  public void tasksDeleted(TasksDeleted event) {
     for (IScheduledTask task : event.getTasks()) {
       // Ignore pruned tasks, since they are irrelevant to updates.
       try {
@@ -78,7 +78,7 @@ class JobUpdateEventSubscriber implements PubsubEvent.EventSubscriber {
   }
 
   @Subscribe
-  public synchronized void schedulerActive(PubsubEvent.SchedulerActive event) {
+  public void schedulerActive(PubsubEvent.SchedulerActive event) {
     try {
       controller.systemResume();
     } catch (RuntimeException e) {


Mime
View raw message