From c3ba115e3c42a6bcf3f7aec0404d12f9c375da78 Mon Sep 17 00:00:00 2001
From: Wenda Ni <wenni@microsoft.com>
Date: Sun, 17 Feb 2019 07:33:57 +0000
Subject: [PATCH 1/2] Log error and return if no lossless TC is found when
 registering pfcwd stats on a port

Signed-off-by: Wenda Ni <wenni@microsoft.com>
---
 orchagent/pfcwdorch.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/orchagent/pfcwdorch.cpp b/orchagent/pfcwdorch.cpp
index e0283bfeee2..3abdbb19afa 100644
--- a/orchagent/pfcwdorch.cpp
+++ b/orchagent/pfcwdorch.cpp
@@ -469,6 +469,11 @@ void PfcWdSwOrch<DropHandler, ForwardHandler>::registerInWdDb(const Port& port,
 
         losslessTc.insert(i);
     }
+    if (losslessTc.empty())
+    {
+        SWSS_LOG_ERROR("No lossless TC found on port %s", port.m_alias.c_str());
+        return;
+    }
 
     if (!c_portStatIds.empty())
     {

From 9f0bef8743bc2fd21a9370115146352b8ec58674 Mon Sep 17 00:00:00 2001
From: Wenda Ni <wenni@microsoft.com>
Date: Thu, 28 Feb 2019 21:55:23 +0000
Subject: [PATCH 2/2] Fix PFC watchdog not getting lossless TC

Signed-off-by: Wenda Ni <wenni@microsoft.com>
---
 orchagent/orchdaemon.cpp | 5 +++--
 orchagent/pfcwdorch.cpp  | 4 +++-
 orchagent/qosorch.cpp    | 1 +
 orchagent/qosorch.h      | 7 +++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/orchagent/orchdaemon.cpp b/orchagent/orchdaemon.cpp
index 6f09bca9678..f9df5aac3e2 100644
--- a/orchagent/orchdaemon.cpp
+++ b/orchagent/orchdaemon.cpp
@@ -32,6 +32,7 @@ AclOrch *gAclOrch;
 CrmOrch *gCrmOrch;
 BufferOrch *gBufferOrch;
 SwitchOrch *gSwitchOrch;
+QosOrch *gQosOrch;
 Directory<Orch*> gDirectory;
 
 OrchDaemon::OrchDaemon(DBConnector *applDb, DBConnector *configDb, DBConnector *stateDb) :
@@ -116,7 +117,7 @@ bool OrchDaemon::init()
         CFG_PFC_PRIORITY_TO_PRIORITY_GROUP_MAP_TABLE_NAME,
         CFG_PFC_PRIORITY_TO_QUEUE_MAP_TABLE_NAME
     };
-    QosOrch *qos_orch = new QosOrch(m_configDb, qos_tables);
+    gQosOrch = new QosOrch(m_configDb, qos_tables);
 
     vector<string> buffer_tables = {
         CFG_BUFFER_POOL_TABLE_NAME,
@@ -158,7 +159,7 @@ bool OrchDaemon::init()
      * when iterating ConsumerMap.
      * That is ensured implicitly by the order of map key, "LAG_TABLE" is smaller than "VLAN_TABLE" in lexicographic order.
      */
-    m_orchList = { gSwitchOrch, gCrmOrch, gBufferOrch, gPortsOrch, gIntfsOrch, gNeighOrch, gRouteOrch, copp_orch, tunnel_decap_orch, qos_orch, wm_orch };
+    m_orchList = { gSwitchOrch, gCrmOrch, gBufferOrch, gPortsOrch, gIntfsOrch, gNeighOrch, gRouteOrch, copp_orch, tunnel_decap_orch, gQosOrch, wm_orch };
 
 
     bool initialize_dtel = false;
diff --git a/orchagent/pfcwdorch.cpp b/orchagent/pfcwdorch.cpp
index 3abdbb19afa..36dc9875867 100644
--- a/orchagent/pfcwdorch.cpp
+++ b/orchagent/pfcwdorch.cpp
@@ -8,6 +8,7 @@
 #include "select.h"
 #include "notifier.h"
 #include "redisclient.h"
+#include "qosorch.h"
 
 #define PFC_WD_GLOBAL                   "GLOBAL"
 #define PFC_WD_ACTION                   "action"
@@ -28,6 +29,7 @@ extern sai_port_api_t *sai_port_api;
 extern sai_queue_api_t *sai_queue_api;
 
 extern PortsOrch *gPortsOrch;
+extern QosOrch   *gQosOrch;
 
 template <typename DropHandler, typename ForwardHandler>
 PfcWdOrch<DropHandler, ForwardHandler>::PfcWdOrch(DBConnector *db, vector<string> &tableNames):
@@ -50,7 +52,7 @@ void PfcWdOrch<DropHandler, ForwardHandler>::doTask(Consumer& consumer)
 {
     SWSS_LOG_ENTER();
 
-    if (!gPortsOrch->isPortReady())
+    if ((!gPortsOrch->isPortReady()) || (!gQosOrch->isQosMapsApplied()))
     {
         return;
     }
diff --git a/orchagent/qosorch.cpp b/orchagent/qosorch.cpp
index 514cb5ec4da..bbe2e231e18 100644
--- a/orchagent/qosorch.cpp
+++ b/orchagent/qosorch.cpp
@@ -1357,6 +1357,7 @@ task_process_status QosOrch::handlePortQosMapTable(Consumer& consumer)
         }
     }
 
+    m_qosMapsApplied = true;
     SWSS_LOG_NOTICE("Applied QoS maps to ports");
     return task_process_status::task_success;
 }
diff --git a/orchagent/qosorch.h b/orchagent/qosorch.h
index 0d9d22cd35f..4680ad0d085 100644
--- a/orchagent/qosorch.h
+++ b/orchagent/qosorch.h
@@ -113,6 +113,11 @@ class QosOrch : public Orch
 
     static type_map& getTypeMap();
     static type_map m_qos_maps;
+
+    bool isQosMapsApplied(void)
+    {
+        return m_qosMapsApplied;
+    }
 private:
     virtual void doTask(Consumer& consumer);
 
@@ -155,5 +160,7 @@ class QosOrch : public Orch
     };
 
     std::unordered_map<sai_object_id_t, SchedulerGroupPortInfo_t> m_scheduler_group_port_info;
+
+    bool m_qosMapsApplied = false;
 };
 #endif /* SWSS_QOSORCH_H */