commit | 339a3d923890363dadba31e5408fad8dcc9a3648 | [log] [tgz] |
---|---|---|
author | alshabib <alshabibi.ali@gmail.com> | Fri Sep 26 17:54:32 2014 -0700 |
committer | alshabib <alshabibi.ali@gmail.com> | Fri Sep 26 17:54:32 2014 -0700 |
tree | 20f94d3f6cc027e216cc9b67f19efb2d753bed2d | |
parent | f92d67fbcf22e6c3f9fe30722ebdebb639b95f40 [diff] |
added onos-start-network and fake distributed stores and fixed mastership bugs/omissions Change-Id: I6cf9f1a13bf9e8f715bf5d72249431d94878b204
diff --git a/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/OFChannelHandler.java b/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/OFChannelHandler.java index 7850a58..75c139d 100644 --- a/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/OFChannelHandler.java +++ b/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/OFChannelHandler.java
@@ -521,9 +521,7 @@ // if two controllers are master (even if its only for // a brief period). We might need to see if these errors // persist before we reassert - log.warn("Received permission error from switch {} while" + - "being master. Reasserting master role.", - h.getSwitchInfoString()); + h.sw.reassertRole(); } else if (m.getErrType() == OFErrorType.FLOW_MOD_FAILED && ((OFFlowModFailedErrorMsg) m).getCode() ==
diff --git a/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/RoleManager.java b/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/RoleManager.java index 7eb2445..b47bada 100644 --- a/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/RoleManager.java +++ b/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/RoleManager.java
@@ -142,9 +142,9 @@ } // OF1.0 switch with support for NX_ROLE_REQUEST vendor extn. // make Role.EQUAL become Role.SLAVE + pendingRole = role; role = (role == RoleState.EQUAL) ? RoleState.SLAVE : role; pendingXid = sendNxRoleRequest(role); - pendingRole = role; requestPending = true; } else { // OF1.3 switch, use OFPT_ROLE_REQUEST message