mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-04 00:05:15 +00:00
Code Issues Releases Wiki Activity

Reapplying the dscp changes: No need to restart DB/OVS on changing dscp value.

Browse Source 
This patch reapplies the changes that were reverted with the commit 59efa47
(Revert DSCP update changes.). It also addresses the problem introduced by
the original commits, cd8fca2 ((jsonrpc: Correctly setting the dscp value
before reconnect.) and b2e18d (No need to restart DB / OVS on changing
dscp value.), that caused numerous unit test failures on some systems (as
diagnosed by valgrind).
With this change there is no need to restart the DB or OVS on configuring a
different value for the manager or controller connection respectively. On
detecting a change in the dscp value on the socket, the previous socket is
closed and a new socket is created and connection is established with the new
configured dscp value.

Signed-off-by: Mehak Mahajan <mmahajan@nicira.com>
This commit is contained in:
Mehak Mahajan
2012-06-21 12:22:42 -07:00
parent bed69b3e61
commit 0442efd9b1
5 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/jsonrpc.c
View File

@@ -793,6 +793,7 @@ jsonrpc_session_open_unreliably(struct jsonrpc *jsonrpc)
reconnect_set_name(s->reconnect, jsonrpc_get_name(jsonrpc));
reconnect_set_max_tries(s->reconnect, 0);
reconnect_connected(s->reconnect, time_msec());
s->dscp = 0;
s->rpc = jsonrpc;
s->stream = NULL;
s->pstream = NULL;
@@ -1058,5 +1059,8 @@ void
jsonrpc_session_set_dscp(struct jsonrpc_session *s,
uint8_t dscp)
{
if (s->dscp != dscp) {
s->dscp = dscp;
jsonrpc_session_force_reconnect(s);
}
}

6
lib/rconn.c
View File

@@ -226,6 +226,12 @@ rconn_set_dscp(struct rconn *rc, uint8_t dscp)
rc->dscp = dscp;
}
uint8_t
rconn_get_dscp(const struct rconn *rc)
{
return rc->dscp;
}
void
rconn_set_probe_interval(struct rconn *rc, int probe_interval)
{

1
lib/rconn.h
View File

@@ -40,6 +40,7 @@ struct rconn_packet_counter;
struct rconn *rconn_create(int inactivity_probe_interval,
int max_backoff, uint8_t dscp);
void rconn_set_dscp(struct rconn *rc, uint8_t dscp);
uint8_t rconn_get_dscp(const struct rconn *rc);
void rconn_set_max_backoff(struct rconn *, int max_backoff);
int rconn_get_max_backoff(const struct rconn *);
void rconn_set_probe_interval(struct rconn *, int inactivity_probe_interval);

6
ofproto/connmgr.c
View File

@@ -1114,6 +1114,12 @@ ofconn_reconfigure(struct ofconn *ofconn, const struct ofproto_controller *c)
rconn_set_probe_interval(ofconn->rconn, probe_interval);
ofconn_set_rate_limit(ofconn, c->rate_limit, c->burst_limit);
/* If dscp value changed reconnect. */
if (c->dscp != rconn_get_dscp(ofconn->rconn)) {
rconn_set_dscp(ofconn->rconn, c->dscp);
rconn_reconnect(ofconn->rconn);
}
}
/* Returns true if it makes sense for 'ofconn' to receive and process OpenFlow

14
vswitchd/vswitch.xml
View File

@@ -2756,10 +2756,9 @@
Service (QoS) on IP networks.
The DSCP value specified here is used when establishing the connection
between the controller and the Open vSwitch. The connection must be
reset for the new DSCP values to take effect. If no value is
specified, a default value of 48 is chosen. Valid DSCP values must be
in the range 0 to 63.
between the controller and the Open vSwitch. If no value is specified,
a default value of 48 is chosen. Valid DSCP values must be in the
range 0 to 63.
</column>
</group>
@@ -3003,10 +3002,9 @@
Service (QoS) on IP networks.
The DSCP value specified here is used when establishing the connection
between the manager and the Open vSwitch. The connection must be
reset for the new DSCP values to take effect. If no value is
specified, a default value of 48 is chosen. Valid DSCP values must be
in the range 0 to 63.
between the manager and the Open vSwitch. If no value is specified, a
default value of 48 is chosen. Valid DSCP values must be in the range
0 to 63.
</column>
</group>