Skip to content

Commit

Permalink
[orchagent]: Fixing retry logic when QoS map is not created (sonic-ne…
Browse files Browse the repository at this point in the history 
…t#177)

- Fix retry logic when the map is yet to create
- Refactor code to suppress logs that are not errors

Signed-off-by: Shuotian Cheng <shuche@microsoft.com>
  • Loading branch information
Shuotian Cheng committed Mar 21, 2017
1 parent 837ea86 commit 49de6dc
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 82 deletions.
4 changes: 2 additions & 2 deletions orchagent/orch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ bool Orch::parseReference(type_map &type_maps, string &ref_in, string &type_name
auto obj_it = obj_map->find(tokens[1]);
if (obj_it == obj_map->end())
{
SWSS_LOG_ERROR("map:%s does not contain object with name:%s\n", tokens[0].c_str(), tokens[1].c_str());
SWSS_LOG_INFO("map:%s does not contain object with name:%s\n", tokens[0].c_str(), tokens[1].c_str());
return false;
}
type_name = tokens[0];
Expand All @@ -178,9 +178,9 @@ ref_resolve_status Orch::resolveFieldRefValue(
bool hit = false;
for (auto i = kfvFieldsValues(tuple).begin(); i != kfvFieldsValues(tuple).end(); i++)
{
SWSS_LOG_DEBUG("field:%s, value:%s", fvField(*i).c_str(), fvValue(*i).c_str());
if (fvField(*i) == field_name)
{
SWSS_LOG_DEBUG("field:%s, value:%s", fvField(*i).c_str(), fvValue(*i).c_str());
if (hit)
{
SWSS_LOG_ERROR("Multiple same fields %s", field_name.c_str());
Expand Down
176 changes: 97 additions & 79 deletions orchagent/qosorch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,15 @@ map<string, sai_ecn_mark_mode_t> ecn_map = {
{"ecn_all", SAI_ECN_MARK_MODE_ALL}
};

type_map QosOrch::m_qos_type_maps = {
map<string, sai_port_attr_t> qos_to_attr_map = {
{dscp_to_tc_field_name, SAI_PORT_ATTR_QOS_DSCP_TO_TC_MAP},
{tc_to_queue_field_name, SAI_PORT_ATTR_QOS_TC_TO_QUEUE_MAP},
{tc_to_pg_map_field_name, SAI_PORT_ATTR_QOS_TC_TO_PRIORITY_GROUP_MAP},
{pfc_to_pg_map_name, SAI_PORT_ATTR_QOS_PFC_PRIORITY_TO_PRIORITY_GROUP_MAP},
{pfc_to_queue_map_name, SAI_PORT_ATTR_QOS_PFC_PRIORITY_TO_QUEUE_MAP}
};

type_map QosOrch::m_qos_maps = {
{APP_DSCP_TO_TC_MAP_TABLE_NAME, new object_map()},
{APP_TC_TO_QUEUE_MAP_TABLE_NAME, new object_map()},
{APP_SCHEDULER_TABLE_NAME, new object_map()},
Expand All @@ -46,6 +54,7 @@ type_map QosOrch::m_qos_type_maps = {
task_process_status QosMapHandler::processWorkItem(Consumer& consumer)
{
SWSS_LOG_ENTER();

sai_object_id_t sai_object = SAI_NULL_OBJECT_ID;
auto it = consumer.m_toSync.begin();
KeyOpFieldsValuesTuple tuple = it->second;
Expand All @@ -68,21 +77,23 @@ task_process_status QosMapHandler::processWorkItem(Consumer& consumer)
{
if (!modifyQosItem(sai_object, attributes))
{
SWSS_LOG_ERROR("Failed to set settings to existing dscp_to_tc map. db name:%s sai object:%lx",
qos_object_name.c_str(), sai_object);
SWSS_LOG_ERROR("Failed to set [%s:%s]", qos_map_type_name.c_str(), qos_object_name.c_str());
freeAttribResources(attributes);
return task_process_status::task_failed;
}
SWSS_LOG_NOTICE("Set [%s:%s]", qos_map_type_name.c_str(), qos_object_name.c_str());
}
else {
else
{
sai_object = addQosItem(attributes);
if (sai_object == SAI_NULL_OBJECT_ID)
{
SWSS_LOG_ERROR("Failed to create dscp_to_tc map. db name:%s", qos_object_name.c_str());
SWSS_LOG_ERROR("Failed to create [%s:%s]", qos_map_type_name.c_str(), qos_object_name.c_str());
freeAttribResources(attributes);
return task_process_status::task_failed;
}
(*(QosOrch::getTypeMap()[qos_map_type_name]))[qos_object_name] = sai_object;
SWSS_LOG_NOTICE("Created [%s:%s]", qos_map_type_name.c_str(), qos_object_name.c_str());
}
freeAttribResources(attributes);
}
Expand Down Expand Up @@ -579,7 +590,7 @@ QosOrch::QosOrch(DBConnector *db, vector<string> &tableNames) : Orch(db, tableNa
type_map& QosOrch::getTypeMap()
{
SWSS_LOG_ENTER();
return m_qos_type_maps;
return m_qos_maps;
}

void QosOrch::initColorAcl()
Expand Down Expand Up @@ -709,22 +720,18 @@ void QosOrch::initTableHandlers()
task_process_status QosOrch::handleSchedulerTable(Consumer& consumer)
{
SWSS_LOG_ENTER();

sai_status_t sai_status;
sai_object_id_t sai_object = SAI_NULL_OBJECT_ID;
auto it = consumer.m_toSync.begin();
KeyOpFieldsValuesTuple tuple = it->second;
string qos_map_type_name = consumer.m_consumer->getTableName();

KeyOpFieldsValuesTuple tuple = consumer.m_toSync.begin()->second;
string qos_map_type_name = APP_SCHEDULER_TABLE_NAME;
string qos_object_name = kfvKey(tuple);
string op = kfvOp(tuple);

if (qos_map_type_name != APP_SCHEDULER_TABLE_NAME)
if (m_qos_maps[qos_map_type_name]->find(qos_object_name) != m_qos_maps[qos_map_type_name]->end())
{
SWSS_LOG_ERROR("Key with invalid table type passed in %s, expected:%s\n", qos_map_type_name.c_str(), APP_SCHEDULER_TABLE_NAME);
return task_process_status::task_invalid_entry;
}
if (m_qos_type_maps[qos_map_type_name]->find(qos_object_name) != m_qos_type_maps[qos_map_type_name]->end())
{
sai_object = (*(m_qos_type_maps[qos_map_type_name]))[qos_object_name];
sai_object = (*(m_qos_maps[qos_map_type_name]))[qos_object_name];
if (sai_object == SAI_NULL_OBJECT_ID)
{
SWSS_LOG_ERROR("Error sai_object must exist for key %s\n", qos_object_name.c_str());
Expand Down Expand Up @@ -792,11 +799,12 @@ task_process_status QosOrch::handleSchedulerTable(Consumer& consumer)
sai_status = sai_scheduler_api->create_scheduler_profile(&sai_object, sai_attr_list.size(), sai_attr_list.data());
if (sai_status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("fail to call sai_scheduler_api->create_scheduler_profile: %d", sai_status);
SWSS_LOG_ERROR("Failed to create scheduler profile [%s:%s], rv:%d",
qos_map_type_name.c_str(), qos_object_name.c_str(), sai_status);
return task_process_status::task_failed;
}
SWSS_LOG_NOTICE("Create scheduler profile");
(*(m_qos_type_maps[qos_map_type_name]))[qos_object_name] = sai_object;
SWSS_LOG_NOTICE("Created [%s:%s]", qos_map_type_name.c_str(), qos_object_name.c_str());
(*(m_qos_maps[qos_map_type_name]))[qos_object_name] = sai_object;
}
}
else if (op == DEL_COMMAND)
Expand All @@ -812,8 +820,8 @@ task_process_status QosOrch::handleSchedulerTable(Consumer& consumer)
SWSS_LOG_ERROR("Failed to remove scheduler profile. db name:%s sai object:%lx", qos_object_name.c_str(), sai_object);
return task_process_status::task_failed;
}
auto it_to_delete = (m_qos_type_maps[qos_map_type_name])->find(qos_object_name);
(m_qos_type_maps[qos_map_type_name])->erase(it_to_delete);
auto it_to_delete = (m_qos_maps[qos_map_type_name])->find(qos_object_name);
(m_qos_maps[qos_map_type_name])->erase(it_to_delete);
}
else
{
Expand Down Expand Up @@ -994,7 +1002,7 @@ task_process_status QosOrch::handleQueueTable(Consumer& consumer)
queue_ind = ind;
SWSS_LOG_DEBUG("processing queue:%zd", queue_ind);
sai_object_id_t sai_scheduler_profile;
resolve_result = resolveFieldRefValue(m_qos_type_maps, scheduler_field_name, tuple, sai_scheduler_profile);
resolve_result = resolveFieldRefValue(m_qos_maps, scheduler_field_name, tuple, sai_scheduler_profile);
if (ref_resolve_status::success == resolve_result)
{
if (op == SET_COMMAND)
Expand Down Expand Up @@ -1022,15 +1030,15 @@ task_process_status QosOrch::handleQueueTable(Consumer& consumer)
{
if(ref_resolve_status::not_resolved == resolve_result)
{
SWSS_LOG_ERROR("Missing or invalid scheduler reference\n");
SWSS_LOG_INFO("Missing or invalid scheduler reference\n");
return task_process_status::task_need_retry;
}
SWSS_LOG_ERROR("Resolving scheduler reference failed\n");
return task_process_status::task_failed;
}

sai_object_id_t sai_wred_profile;
resolve_result = resolveFieldRefValue(m_qos_type_maps, wred_profile_field_name, tuple, sai_wred_profile);
resolve_result = resolveFieldRefValue(m_qos_maps, wred_profile_field_name, tuple, sai_wred_profile);
if (ref_resolve_status::success == resolve_result)
{
if (op == SET_COMMAND)
Expand Down Expand Up @@ -1070,16 +1078,18 @@ task_process_status QosOrch::handleQueueTable(Consumer& consumer)
return task_process_status::task_success;
}

bool QosOrch::applyMapToPort(Port &port, sai_attr_id_t attr_id, sai_object_id_t map)
bool QosOrch::applyMapToPort(Port &port, sai_attr_id_t attr_id, sai_object_id_t map_id)
{
SWSS_LOG_ENTER();

sai_attribute_t attr;
sai_status_t sai_status;
attr.id = attr_id;
attr.value.oid = map;
if (SAI_STATUS_SUCCESS != (sai_status = sai_port_api->set_port_attribute(port.m_port_id, &attr)))
attr.value.oid = map_id;

sai_status_t status = sai_port_api->set_port_attribute(port.m_port_id, &attr);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed setting sai object:%lx for port:%s, status:%d\n", map, port.m_alias.c_str(), sai_status);
SWSS_LOG_ERROR("Failed setting sai object:%lx for port:%s, status:%d\n", map_id, port.m_alias.c_str(), status);
return false;
}
return true;
Expand All @@ -1093,9 +1103,10 @@ task_process_status QosOrch::ResolveMapAndApplyToPort(
string op)
{
SWSS_LOG_ENTER();

sai_object_id_t sai_object = SAI_NULL_OBJECT_ID;
bool result;
ref_resolve_status resolve_result = resolveFieldRefValue(m_qos_type_maps, field_name, tuple, sai_object);
ref_resolve_status resolve_result = resolveFieldRefValue(m_qos_maps, field_name, tuple, sai_object);
if (ref_resolve_status::success == resolve_result)
{
if (op == SET_COMMAND)
Expand Down Expand Up @@ -1136,82 +1147,89 @@ task_process_status QosOrch::ResolveMapAndApplyToPort(
task_process_status QosOrch::handlePortQosMapTable(Consumer& consumer)
{
SWSS_LOG_ENTER();
auto it = consumer.m_toSync.begin();
KeyOpFieldsValuesTuple tuple = it->second;
Port port;

KeyOpFieldsValuesTuple tuple = consumer.m_toSync.begin()->second;
string key = kfvKey(tuple);
string op = kfvOp(tuple);
vector<string> port_names;
sai_uint8_t pfc_enable = 0;
bool pfc_enable_present = false;

for (auto i = kfvFieldsValues(tuple).begin(); i != kfvFieldsValues(tuple).end(); i++)
sai_uint8_t pfc_enable = 0;
map<sai_port_attr_t, pair<string, sai_object_id_t>> update_list;
for (auto it = kfvFieldsValues(tuple).begin(); it != kfvFieldsValues(tuple).end(); it++)
{
if (fvField(*i) == pfc_enable_name)
/* Check all map instances are created before applying to ports */
if (qos_to_attr_map.find(fvField(*it)) != qos_to_attr_map.end())
{
sai_object_id_t id;
string map_type_name = fvField(*it), map_name = fvValue(*it);
ref_resolve_status status = resolveFieldRefValue(m_qos_maps, map_type_name, tuple, id);

if (status != ref_resolve_status::success)
{
SWSS_LOG_INFO("Port QoS map %s is not yet created", map_name.c_str());
return task_process_status::task_need_retry;
}

update_list[qos_to_attr_map[map_type_name]] = make_pair(map_name, id);
}

if (fvField(*it) == pfc_enable_name)
{
pfc_enable_present = true;
vector<string> queue_indexes;
queue_indexes = tokenize(fvValue(*i), list_item_delimiter);
queue_indexes = tokenize(fvValue(*it), list_item_delimiter);
for(string q_ind : queue_indexes)
{
sai_uint8_t q_val = stoi(q_ind);
pfc_enable |= (1 << q_val);
}
break;
}
}

port_names = tokenize(key, list_item_delimiter);

vector<string> port_names = tokenize(key, list_item_delimiter);
for (string port_name : port_names)
{
Port port;
SWSS_LOG_DEBUG("processing port:%s", port_name.c_str());

/* Skip port which is not found */
if (!gPortsOrch->getPort(port_name, port))
{
SWSS_LOG_ERROR("Port with alias:%s not found\n", port_name.c_str());
return task_process_status::task_invalid_entry;
SWSS_LOG_ERROR("Failed to apply QoS maps to port %s. Port is not found.", port_name.c_str());
continue;
}

task_process_status task_status = ResolveMapAndApplyToPort(port, SAI_PORT_ATTR_QOS_DSCP_TO_TC_MAP, dscp_to_tc_field_name, tuple, op);
if(task_process_status::task_failed == task_status)
{
return task_status;
}
task_status = ResolveMapAndApplyToPort(port, SAI_PORT_ATTR_QOS_TC_TO_QUEUE_MAP, tc_to_queue_field_name, tuple, op);
if(task_process_status::task_failed == task_status)
{
return task_status;
}
task_status = ResolveMapAndApplyToPort(port, SAI_PORT_ATTR_QOS_TC_TO_PRIORITY_GROUP_MAP, tc_to_pg_map_field_name, tuple, op);
if(task_process_status::task_failed == task_status)
/* Apply a list of attributes to be applied */
for (auto it = update_list.begin(); it != update_list.end(); it++)
{
return task_status;
}
task_status = ResolveMapAndApplyToPort(port, SAI_PORT_ATTR_QOS_PFC_PRIORITY_TO_PRIORITY_GROUP_MAP, pfc_to_pg_map_name, tuple, op);
if(task_process_status::task_failed == task_status)
{
return task_status;
}
task_status = ResolveMapAndApplyToPort(port, SAI_PORT_ATTR_QOS_PFC_PRIORITY_TO_QUEUE_MAP, pfc_to_queue_map_name, tuple, op);
if(task_process_status::task_failed == task_status)
{
return task_status;
sai_attribute_t attr;
attr.id = it->first;
attr.value.oid = it->second.second;

sai_status_t status = sai_port_api->set_port_attribute(port.m_port_id, &attr);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to apply %s to port %s, rv:%d",
it->second.first.c_str(), port_name.c_str(), status);
return task_process_status::task_invalid_entry;
}
SWSS_LOG_INFO("Applied %s to port %s", it->second.first.c_str(), port_name.c_str());
}
if(pfc_enable_present)

if (pfc_enable)
{
sai_attribute_t pfc_attr;
pfc_attr.id = SAI_PORT_ATTR_PRIORITY_FLOW_CONTROL;
pfc_attr.value.u8 = pfc_enable;
sai_status_t status = sai_port_api->set_port_attribute(port.m_port_id, &pfc_attr);
sai_attribute_t attr;
attr.id = SAI_PORT_ATTR_PRIORITY_FLOW_CONTROL;
attr.value.u8 = pfc_enable;

sai_status_t status = sai_port_api->set_port_attribute(port.m_port_id, &attr);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Applying pfc_enable bits:0x%x to Port with alias:%s failed\n", pfc_enable, port_name.c_str());
return task_process_status::task_failed;
SWSS_LOG_ERROR("Failed to apply PFC bits 0x%x to port %s, rv:%d",
pfc_enable, port_name.c_str(), status);
}

SWSS_LOG_INFO("Applied PFC bits 0x%x to port %s", pfc_enable, port_name.c_str());
}
}

SWSS_LOG_NOTICE("Applied QoS maps to ports");
return task_process_status::task_success;
}

Expand All @@ -1226,7 +1244,7 @@ void QosOrch::doTask(Consumer &consumer)
// make sure table is recognized, and we have handler for it
//
string qos_map_type_name = consumer.m_consumer->getTableName();
if (m_qos_type_maps.find(qos_map_type_name) == m_qos_type_maps.end())
if (m_qos_maps.find(qos_map_type_name) == m_qos_maps.end())
{
SWSS_LOG_ERROR("Unrecognised qos table encountered:%s\n", qos_map_type_name.c_str());
it = consumer.m_toSync.erase(it);
Expand Down Expand Up @@ -1256,7 +1274,7 @@ void QosOrch::doTask(Consumer &consumer)
dumpTuple(consumer, tuple);
return;
case task_process_status::task_need_retry :
SWSS_LOG_ERROR("Processing QOS task item failed, will retry.");
SWSS_LOG_INFO("Processing QOS task item failed, will retry.");
dumpTuple(consumer, tuple);
it++;
break;
Expand Down
2 changes: 1 addition & 1 deletion orchagent/qosorch.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class QosOrch : public Orch
QosOrch(DBConnector *db, vector<string> &tableNames);

static type_map& getTypeMap();
static type_map m_qos_type_maps;
static type_map m_qos_maps;
private:
virtual void doTask(Consumer& consumer);

Expand Down

0 comments on commit 49de6dc

Please sign in to comment.