Copp Changes

scripts/db_migrator.py

@@ -142,6 +142,17 @@ def migrate_intf_table(self):
             self.appDB.set(self.appDB.APPL_DB, table, 'NULL', 'NULL')
             if_db.append(if_name)
 
+    def migrate_copp_table(self):
+        '''
+        Delete the existing COPP table
+        '''
+        if self.appDB is None:
+            return
+
+        keys = self.appDB.keys(self.appDB.APPL_DB, "COPP_TABLE:*")
+        for copp_key in keys:
+            self.appDB.delete(self.appDB.APPL_DB, copp_key)
+
     def version_unknown(self):
         """
         version_unknown tracks all SONiC versions that doesn't have a version
@@ -199,17 +210,16 @@ def version_1_0_3(self):
         if self.asic_type == "mellanox":
             if self.mellanox_buffer_migrator.mlnx_migrate_buffer_pool_size('version_1_0_3', 'version_1_0_4') and self.mellanox_buffer_migrator.mlnx_migrate_buffer_profile('version_1_0_3', 'version_1_0_4'):
                 self.set_version('version_1_0_4')
-        else:
-            self.set_version('version_1_0_4')
 
+        self.set_version('version_1_0_4')
         return 'version_1_0_4'
 
     def version_1_0_4(self):
         """
-        Current latest version. Nothing to do here.
+        Current latest version. Always perform copp table migration at current latest version
         """
         log.log_info('Handling version_1_0_4')
-
+        self.migrate_copp_table()
         return None
 
     def get_version(self):

scripts/fast-reboot

@@ -246,6 +246,14 @@ function backup_database()
             end
         end
     " 0 > /dev/null
+    # Delete COPP_TABLE keys in APPL_DB
+    sonic-db-cli APPL_DB eval "
+        for _, k in ipairs(redis.call('keys', '*')) do
+            if string.match(k, 'COPP_TABLE:') then
+                redis.call('del', k)
+            end
+        end
+    " 0 > /dev/null
     sonic-db-cli SAVE > /dev/null
     #TODO : need a script to copy all rdb files if there is multiple db instances config
     docker cp database:/var/lib/redis/$REDIS_FILE $WARM_DIR