Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit 550aca9, reversing changes made to 676c0b5.
pettershao-ragilenetworks · Jul 20, 2019 · 03fc996 · 03fc996
1 parent e840a6b
commit 03fc996
Show file tree

Hide file tree

Showing 12 changed files with 676 additions and 896 deletions.
diff --git a/lib/inc/sai_redis.h b/lib/inc/sai_redis.h
@@ -54,16 +54,12 @@ extern void recordLine(std::string s);
 extern std::string joinFieldValues(
         _In_ const std::vector<swss::FieldValueTuple> &values);
 
-extern sai_status_t internal_api_wait_for_response(
-        _In_ sai_common_api_t api);
-
 // other global declarations
 
 extern volatile bool g_record;
 extern volatile bool g_useTempView;
 extern volatile bool g_asicInitViewMode;
 extern volatile bool g_logrotate;
-extern volatile bool g_syncMode;
 
 extern sai_service_method_table_t                   g_services;
 extern std::shared_ptr<swss::ProducerTable>         g_asicState;

diff --git a/lib/inc/sairedis.h b/lib/inc/sairedis.h
@@ -104,19 +104,6 @@ typedef enum _sai_redis_switch_attr_t
      */
     SAI_REDIS_SWITCH_ATTR_PERFORM_LOG_ROTATE,
 
-    /**
-     * @brief Synchronous mode.
-     *
-     * Enable or disable synchronous mode. When enabled syncd also needs to be
-     * running in synchronous mode. Command pipeline will be disabled when this
-     * flag will be set to true.
-     *
-     * @type bool
-     * @flags CREATE_AND_SET
-     * @default false
-     */
-    SAI_REDIS_SWITCH_ATTR_SYNC_MODE,
-
 } sai_redis_switch_attr_t;
 
 /*

diff --git a/lib/src/sai_redis_generic_create.cpp b/lib/src/sai_redis_generic_create.cpp
@@ -234,7 +234,9 @@ sai_status_t internal_redis_generic_create(
 
     g_asicState->set(key, entry, "create");
 
-    return internal_api_wait_for_response(SAI_COMMON_API_CREATE);
+    // we assume create will always succeed which may not be true
+    // we should make this synchronous call
+    return SAI_STATUS_SUCCESS;
 }
 
 sai_status_t redis_generic_create(
@@ -387,7 +389,7 @@ sai_status_t internal_redis_bulk_generic_create(
         g_asicState->set(key, entries, "bulkcreate");
     }
 
-    return internal_api_wait_for_response(SAI_COMMON_API_CREATE);
+    return SAI_STATUS_SUCCESS;
 }
 
 #define REDIS_ENTRY_CREATE(OT,ot)                       \

diff --git a/lib/src/sai_redis_generic_get.cpp b/lib/src/sai_redis_generic_get.cpp
@@ -205,7 +205,7 @@ sai_status_t internal_redis_generic_get(
             const std::string &op = kfvOp(kco);
             const std::string &opkey = kfvKey(kco);
 
-            SWSS_LOG_INFO("response: op = %s, key = %s", opkey.c_str(), op.c_str());
+            SWSS_LOG_DEBUG("response: op = %s, key = %s", opkey.c_str(), op.c_str());
 
             if (op != "getresponse") // ignore non response messages
             {

diff --git a/lib/src/sai_redis_generic_remove.cpp b/lib/src/sai_redis_generic_remove.cpp
@@ -21,7 +21,7 @@ sai_status_t internal_redis_generic_remove(
 
     g_asicState->del(key, "remove");
 
-    return internal_api_wait_for_response(SAI_COMMON_API_REMOVE);
+    return SAI_STATUS_SUCCESS;
 }
 
 sai_status_t redis_generic_remove(
@@ -118,10 +118,10 @@ sai_status_t internal_redis_bulk_generic_remove(
         }
 
         /*
-         * Capital 'R' stands for bulk CREATE operation.
+         * Capital 'C' stands for bulk CREATE operation.
          */
 
-        recordLine("R|" + str_object_type + joined);
+        recordLine("C|" + str_object_type + joined);
     }
 
     // key:         object_type:count
@@ -134,7 +134,7 @@ sai_status_t internal_redis_bulk_generic_remove(
         g_asicState->set(key, entries, "bulkremove");
     }
 
-    return internal_api_wait_for_response(SAI_COMMON_API_CREATE);
+    return SAI_STATUS_SUCCESS;
 }
 
 

diff --git a/lib/src/sai_redis_generic_set.cpp b/lib/src/sai_redis_generic_set.cpp
@@ -2,83 +2,6 @@
 #include "meta/sai_serialize.h"
 #include "meta/saiattributelist.h"
 
-sai_status_t internal_api_wait_for_response(
-        _In_ sai_common_api_t api)
-{
-    SWSS_LOG_ENTER();
-
-    if (!g_syncMode)
-    {
-        /*
-         * By default sync mode is disabled and all create/set/remove are
-         * considered success operations.
-         */
-
-        return SAI_STATUS_SUCCESS;
-    }
-
-    SWSS_LOG_INFO("waiting for response %d", api);
-
-    swss::Select s;
-
-    s.addSelectable(g_redisGetConsumer.get());
-
-    while (true)
-    {
-        SWSS_LOG_INFO("wait for %d api response", api);
-
-        swss::Selectable *sel;
-
-        // get timeout and selector is used for all quad api's
-        int result = s.select(&sel, GET_RESPONSE_TIMEOUT);
-
-        if (result == swss::Select::OBJECT)
-        {
-            swss::KeyOpFieldsValuesTuple kco;
-
-            g_redisGetConsumer->pop(kco);
-
-            const std::string &op = kfvOp(kco);
-            const std::string &opkey = kfvKey(kco);
-
-            SWSS_LOG_INFO("response: op = %s, key = %s", opkey.c_str(), op.c_str());
-
-            if (op != "getresponse") // ignore non response messages
-            {
-                continue;
-            }
-
-            sai_status_t status;
-            sai_deserialize_status(opkey, status);
-
-            if (g_record)
-            {
-                const std::string &str_status = kfvKey(kco);
-                const std::vector<swss::FieldValueTuple> &values = kfvFieldsValues(kco);
-
-                // first serialized is status
-                recordLine("G|" + str_status + "|" + joinFieldValues(values));
-            }
-
-            SWSS_LOG_DEBUG("generic %d api status: %d", api, status);
-
-            return status;
-        }
-
-        SWSS_LOG_ERROR("generic %d api failed due to SELECT operation result: %s", api, getSelectResultAsString(result).c_str());
-        break;
-    }
-
-    if (g_record)
-    {
-        recordLine("G|SAI_STATUS_FAILURE");
-    }
-
-    SWSS_LOG_ERROR("generic %d api failed to get response", api);
-
-    return SAI_STATUS_FAILURE;
-}
-
 sai_status_t internal_redis_generic_set(
         _In_ sai_object_type_t object_type,
         _In_ const std::string &serialized_object_id,
@@ -105,7 +28,7 @@ sai_status_t internal_redis_generic_set(
 
     g_asicState->set(key, entry, "set");
 
-    return internal_api_wait_for_response(SAI_COMMON_API_SET);
+    return SAI_STATUS_SUCCESS;
 }
 
 sai_status_t internal_redis_bulk_generic_set(
@@ -187,7 +110,7 @@ sai_status_t internal_redis_bulk_generic_set(
         g_asicState->set(key, entries, "bulkset");
     }
 
-    return internal_api_wait_for_response(SAI_COMMON_API_CREATE);
+    return SAI_STATUS_SUCCESS;
 }
 
 

diff --git a/lib/src/sai_redis_interfacequery.cpp b/lib/src/sai_redis_interfacequery.cpp
@@ -124,8 +124,6 @@ sai_status_t sai_api_initialize(
     g_redisNotifications = std::make_shared<swss::NotificationConsumer>(g_dbNtf.get(), "NOTIFICATIONS");
     g_redisClient        = std::make_shared<swss::RedisClient>(g_db.get());
 
-    g_asicState->setBuffered(false); // in sync mode, always false
-
     clear_local_state();
 
     g_asicInitViewMode = false;

diff --git a/lib/src/sai_redis_switch.cpp b/lib/src/sai_redis_switch.cpp
@@ -7,7 +7,6 @@
 
 volatile bool g_asicInitViewMode = false; // default mode is apply mode
 volatile bool g_useTempView = false;
-volatile bool g_syncMode = false;
 
 sai_status_t sai_redis_internal_notify_syncd(
         _In_ const std::string& key)
@@ -267,26 +266,7 @@ sai_status_t redis_set_switch_attribute(
                 g_useTempView = attr->value.booldata;
                 return SAI_STATUS_SUCCESS;
 
-            case SAI_REDIS_SWITCH_ATTR_SYNC_MODE:
-
-                g_syncMode = attr->value.booldata;
-
-                if (g_syncMode)
-                {
-                    SWSS_LOG_NOTICE("disabling buffered pipeline in sync mode");
-                    g_asicState->setBuffered(false);
-                }
-
-                return SAI_STATUS_SUCCESS;
-
             case SAI_REDIS_SWITCH_ATTR_USE_PIPELINE:
-
-                if (g_syncMode)
-                {
-                    SWSS_LOG_WARN("use pipeline is not supported in sync mode");
-                    return SAI_STATUS_NOT_SUPPORTED;
-                }
-
                 g_asicState->setBuffered(attr->value.booldata);
                 return SAI_STATUS_SUCCESS;
 

diff --git a/saiplayer/saiplayer.cpp b/saiplayer/saiplayer.cpp
@@ -964,54 +964,6 @@ sai_status_t handle_bulk_route(
 
         return status;
     }
-    else if (api == (sai_common_api_t)SAI_COMMON_API_BULK_CREATE)
-    {
-        std::vector<uint32_t> attr_count;
-
-        std::vector<const sai_attribute_t*> attr_list;
-
-        // route can have multiple attributes, so we need to handle them all
-        for (const auto &alist: attributes)
-        {
-            attr_list.push_back(alist->get_attr_list());
-            attr_count.push_back(alist->get_attr_count());
-        }
-
-        SWSS_LOG_NOTICE("executing BULK route create with %zu routes", attr_count.size());
-
-        sai_status_t status = sai_bulk_create_route_entry(
-                (uint32_t)routes.size(),
-                routes.data(),
-                attr_count.data(),
-                attr_list.data(),
-                SAI_BULK_OP_ERROR_MODE_IGNORE_ERROR, // TODO we need to get that from recording
-                statuses.data());
-
-        if (status != SAI_STATUS_SUCCESS)
-        {
-             // Entire API fails, so no need to compare statuses.
-            return status;
-        }
-
-        for (size_t i = 0; i < statuses.size(); ++i)
-        {
-            if (statuses[i] != recorded_statuses[i])
-            {
-                /*
-                 * If recorded statuses are different than received, throw
-                 * exception since data don't match.
-                 */
-
-                SWSS_LOG_THROW("recorded status is %s but returned is %s on %s",
-                        sai_serialize_status(recorded_statuses[i]).c_str(),
-                        sai_serialize_status(statuses[i]).c_str(),
-                        object_ids[i].c_str());
-            }
-        }
-
-        return status;
-
-    }
     else
     {
         SWSS_LOG_THROW("api %d is not supported in bulk route", api);
@@ -1029,8 +981,7 @@ void processBulk(
         return;
     }
 
-    if (api != (sai_common_api_t)SAI_COMMON_API_BULK_SET &&
-            api != (sai_common_api_t)SAI_COMMON_API_BULK_CREATE)
+    if (api != (sai_common_api_t)SAI_COMMON_API_BULK_SET)
     {
         SWSS_LOG_THROW("bulk common api %d is not supported yet, FIXME", api);
     }
@@ -1203,9 +1154,6 @@ int replay(int argc, char **argv)
             case 'S':
                 processBulk((sai_common_api_t)SAI_COMMON_API_BULK_SET, line);
                 continue;
-            case 'C':
-                processBulk((sai_common_api_t)SAI_COMMON_API_BULK_CREATE, line);
-                continue;
             case 'g':
                 api = SAI_COMMON_API_GET;
                 break;

diff --git a/syncd/scripts/syncd_init_common.sh b/syncd/scripts/syncd_init_common.sh
@@ -59,9 +59,9 @@ function set_start_type()
 {
     if [ x"$WARM_BOOT" == x"true" ]; then
         CMD_ARGS+=" -t warm"
-    elif [ x"$FAST_REBOOT" == x"yes" ]; then
+    elif [ $FAST_REBOOT == "yes" ]; then
         CMD_ARGS+=" -t fast"
-    elif [ x"$FASTFAST_REBOOT" == x"yes" ]; then
+    elif [ $FASTFAST_REBOOT == "yes" ]; then
         CMD_ARGS+=" -t fastfast"
     fi
 }