Merge branch 'sonic-net:master' into community_changes_pac

sonic-net · May 14, 2024 · f9f748d · f9f748d
2 parents 1f9e195 + 0044540
commit f9f748d
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 1 deletion.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -119,6 +119,35 @@ stages:
  artifact_name: sonic-swss-common.arm64
  debian_version: ${{ parameters.debian_version }}
 
+- stage: BuildBookworm
+ dependsOn: BuildArm
+ condition: succeeded('BuildArm')
+ jobs:
+ - template: .azure-pipelines/build-template.yml
+ parameters:
+ arch: amd64
+ sonic_slave: sonic-slave-bookworm:$(BUILD_BRANCH)
+ artifact_name: sonic-swss-common-bookworm
+ debian_version: ${{ parameters.debian_version }}
+
+ - template: .azure-pipelines/build-template.yml
+ parameters:
+ arch: armhf
+ timeout: 180
+ pool: sonicbld-armhf
+ sonic_slave: sonic-slave-bookworm-armhf:$(BUILD_BRANCH)
+ artifact_name: sonic-swss-common-bookworm.armhf
+ debian_version: ${{ parameters.debian_version }}
+
+ - template: .azure-pipelines/build-template.yml
+ parameters:
+ arch: arm64
+ timeout: 180
+ pool: sonicbld-arm64
+ sonic_slave: sonic-slave-bookworm-arm64:$(BUILD_BRANCH)
+ artifact_name: sonic-swss-common-bookworm.arm64
+ debian_version: ${{ parameters.debian_version }}
+
 - stage: BuildSairedis
  dependsOn: Build
  condition: succeeded('Build')

diff --git a/common/asyncdbupdater.cpp b/common/asyncdbupdater.cpp
@@ -56,7 +56,7 @@ void AsyncDBUpdater::dbUpdateThread()
  pthread_setschedprio(pthread_self(), min_priority + 1);
 
  // Follow same logic in ConsumerStateTable: every received data will write to 'table'.
- DBConnector db(m_db->getDbName(), 0, true);
+ DBConnector db(m_db->getDbName(), 0, true, m_db->getDBKey());
  Table table(&db, m_tableName);
  std::mutex cvMutex;
  std::unique_lock<std::mutex> cvLock(cvMutex);

diff --git a/common/dbconnector.cpp b/common/dbconnector.cpp
@@ -632,6 +632,8 @@ void DBConnector::select(DBConnector *db)
 DBConnector::DBConnector(const DBConnector &other)
  : RedisContext(other)
  , m_dbId(other.m_dbId)
+ , m_dbName(other.m_dbName)
+ , m_key(other.m_key)
 {
  select(this);
 }

diff --git a/common/schema.h b/common/schema.h
@@ -23,6 +23,7 @@ namespace swss {
 #define CHASSIS_APP_DB 12
 #define CHASSIS_STATE_DB 13
 #define APPL_STATE_DB 14
+#define EVENT_DB 19
 
 /***** APPLICATION DATABASE *****/
 
@@ -39,6 +40,7 @@ namespace swss {
 #define APP_ROUTE_TABLE_NAME "ROUTE_TABLE"
 #define APP_LABEL_ROUTE_TABLE_NAME "LABEL_ROUTE_TABLE"
 #define APP_TUNNEL_DECAP_TABLE_NAME "TUNNEL_DECAP_TABLE"
+#define APP_TUNNEL_DECAP_TERM_TABLE_NAME "TUNNEL_DECAP_TERM_TABLE"
 #define APP_TUNNEL_ROUTE_TABLE_NAME "TUNNEL_ROUTE_TABLE"
 #define APP_FDB_TABLE_NAME "FDB_TABLE"
 #define APP_PFC_WD_TABLE_NAME "PFC_WD_TABLE"
@@ -426,6 +428,7 @@ namespace swss {
 #define CFG_PEER_SWITCH_TABLE_NAME "PEER_SWITCH"
 
 #define CFG_TUNNEL_TABLE_NAME "TUNNEL"
+#define CFG_SUBNET_DECAP_TABLE_NAME "SUBNET_DECAP"
 
 #define CFG_SYSTEM_PORT_TABLE_NAME "SYSTEM_PORT"
 #define CFG_VOQ_INBAND_INTERFACE_TABLE_NAME "VOQ_INBAND_INTERFACE"
@@ -440,6 +443,7 @@ namespace swss {
 #define CFG_CHASSIS_MODULE_TABLE "CHASSIS_MODULE"
 
 #define CFG_TWAMP_SESSION_TABLE_NAME "TWAMP_SESSION"
+#define CFG_BANNER_MESSAGE_TABLE_NAME "BANNER_MESSAGE"
 
 #define CFG_DHCP_TABLE "DHCP_RELAY"
 
@@ -517,6 +521,9 @@ namespace swss {
 #define STATE_BUFFER_PROFILE_TABLE_NAME "BUFFER_PROFILE_TABLE"
 #define STATE_DHCPv6_COUNTER_TABLE_NAME "DHCPv6_COUNTER_TABLE"
 
+#define STATE_TUNNEL_DECAP_TABLE_NAME "TUNNEL_DECAP_TABLE"
+#define STATE_TUNNEL_DECAP_TERM_TABLE_NAME "TUNNEL_DECAP_TERM_TABLE"
+
 #define STATE_BFD_SESSION_TABLE_NAME "BFD_SESSION_TABLE"
 #define STATE_ROUTE_TABLE_NAME "ROUTE_TABLE"
 #define STATE_VNET_RT_TUNNEL_TABLE_NAME "VNET_ROUTE_TUNNEL_TABLE"
@@ -574,6 +581,12 @@ namespace swss {
 #define APP_FABRIC_MONITOR_DATA_TABLE_NAME "FABRIC_MONITOR_TABLE"
 #define APP_FABRIC_MONITOR_PORT_TABLE_NAME "FABRIC_PORT_TABLE"
 
+#define EVENT_HISTORY_TABLE_NAME "EVENT"
+#define EVENT_CURRENT_ALARM_TABLE_NAME "ALARM"
+#define EVENT_STATS_TABLE_NAME "EVENT_STATS"
+#define EVENT_ALARM_STATS_TABLE_NAME "ALARM_STATS"
+
+
 #ifdef __cplusplus
 }
 #endif