mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-30 22:05:19 +00:00
Code Issues Releases Wiki Activity

Revert DSCP update changes.

Browse Source 
This reverts commit cd8fca2ba0 (jsonrpc:
Correctly setting the dscp value before reconnect.) and commit
b2e18db292 (No need to restart DB / OVS on
changing dscp value.), which on some systems causes numerous unit test
failures that valgrind diagnoses as:

Conditional jump or move depends on uninitialised value(s)
   at 0x805F63F: jsonrpc_session_set_dscp (jsonrpc.c:1061)
   by 0x804F45D: ovsdb_jsonrpc_server_set_remotes (jsonrpc-server.c:417)
   by 0x804B775: reconfigure_from_db (ovsdb-server.c:656)
   by 0x804C231: main (ovsdb-server.c:159)

Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Ben Pfaff
2012-06-20 09:31:42 -07:00
parent cd8fca2ba0
commit 59efa47adf
5 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/jsonrpc.c
View File

@@ -1058,8 +1058,5 @@ void
jsonrpc_session_set_dscp(struct jsonrpc_session *s,
uint8_t dscp)
{
if (s->dscp != dscp) {
s->dscp = dscp;
jsonrpc_session_force_reconnect(s);
}
s->dscp = dscp;
}

6
lib/rconn.c
View File

@@ -226,12 +226,6 @@ 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,7 +40,6 @@ 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,12 +1114,6 @@ 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,9 +2756,10 @@
Service (QoS) on IP networks.
The DSCP value specified here is used when establishing the connection
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.
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.
</column>
</group>
@@ -3002,9 +3003,10 @@
Service (QoS) on IP networks.
The DSCP value specified here is used when establishing the connection
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.
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.
</column>
</group>