From 4e0b2751a8f996cbc9301f7ef1a3719259e8e351 Mon Sep 17 00:00:00 2001 From: lguohan Date: Mon, 9 Aug 2021 13:48:18 -0700 Subject: [PATCH 1/3] [openssh]: move build dep installation to sonic-slave-buster (#8381) install build dep causes dpkg lock issue in parallel build Signed-off-by: Guohan Lu --- sonic-slave-buster/Dockerfile.j2 | 2 ++ src/openssh/Makefile | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2 index 890572320fa2..bbd68a31396e 100644 --- a/sonic-slave-buster/Dockerfile.j2 +++ b/sonic-slave-buster/Dockerfile.j2 @@ -348,6 +348,8 @@ RUN apt-get update && apt-get install -y \ libsystemd-dev \ pkg-config +RUN apt-get -y build-dep openssh + # Build fix for ARMHF buster libsairedis {%- if CONFIGURED_ARCH == "armhf" %} # Install doxygen build dependency packages diff --git a/src/openssh/Makefile b/src/openssh/Makefile index 0fd8642b1285..be05c6ffd675 100644 --- a/src/openssh/Makefile +++ b/src/openssh/Makefile @@ -19,7 +19,6 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : stg import -s ../patch/series # Build package - sudo http_proxy=$(http_proxy) apt-get -y build-dep openssh dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR) popd From fa9f8eecf1b21bd05407032a24ea6d6c8decba2d Mon Sep 17 00:00:00 2001 From: Aravind Mani <53524901+aravindmani-1@users.noreply.github.com> Date: Mon, 9 Aug 2021 14:56:48 -0700 Subject: [PATCH 2/3] DellEMC: Change PG values for S5232f,Z9264f (#7102) * DellEMC: Change PG values for S5232f,Z9264f * change-v1 --- .../DellEMC-S5232f-C32/pg_profile_lookup.ini | 32 +++++++++---------- .../pg_profile_lookup.ini | 32 +++++++++---------- .../pg_profile_lookup.ini | 17 ++++++++++ .../pg_profile_lookup.ini | 17 ++++++++++ .../pg_profile_lookup.ini | 17 ++++++++++ .../DellEMC-Z9264f-C64/pg_profile_lookup.ini | 32 +++++++++---------- .../pg_profile_lookup.ini | 32 +++++++++---------- .../DellEMC-Z9264f-Q64/pg_profile_lookup.ini | 32 +++++++++---------- 8 files changed, 131 insertions(+), 80 deletions(-) create mode 100644 device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/pg_profile_lookup.ini create mode 100644 device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/pg_profile_lookup.ini create mode 100644 device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/pg_profile_lookup.ini diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/pg_profile_lookup.ini index aedda37a8878..a8cf083ec04d 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/pg_profile_lookup.ini +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/pg_profile_lookup.ini @@ -1,17 +1,17 @@ # PG lossless profiles. -# speed cable size xon xoff threshold xon_offset - 10000 5m 1248 2288 35776 -3 2288 - 25000 5m 1248 2288 53248 -3 2288 - 40000 5m 1248 2288 66560 -3 2288 - 50000 5m 1248 2288 90272 -3 2288 - 100000 5m 1248 2288 165568 -3 2288 - 10000 40m 1248 2288 37024 -3 2288 - 25000 40m 1248 2288 53248 -3 2288 - 40000 40m 1248 2288 71552 -3 2288 - 50000 40m 1248 2288 96096 -3 2288 - 100000 40m 1248 2288 177632 -3 2288 - 10000 300m 1248 2288 46176 -3 2288 - 25000 300m 1248 2288 79040 -3 2288 - 40000 300m 1248 2288 108160 -3 2288 - 50000 300m 1248 2288 141856 -3 2288 - 100000 300m 1248 2288 268736 -3 2288 +# speed cable size xon xoff threshold xon_offset + 10000 5m 1024 2048 46080 -3 2048 + 25000 5m 1024 2048 65024 -3 2048 + 40000 5m 1024 2048 77056 -3 2048 + 50000 5m 1024 2048 93440 -3 2048 + 100000 5m 1024 2048 162048 -3 2048 + 10000 40m 1024 2048 47360 -3 2048 + 25000 40m 1024 2048 67840 -3 2048 + 40000 40m 1024 2048 81664 -3 2048 + 50000 40m 1024 2048 99072 -3 2048 + 100000 40m 1024 2048 173568 -3 2048 + 10000 300m 1024 2048 57088 -3 2048 + 25000 300m 1024 2048 92672 -3 2048 + 40000 300m 1024 2048 121344 -3 2048 + 50000 300m 1024 2048 148736 -3 2048 + 100000 300m 1024 2048 272640 -3 2048 diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/pg_profile_lookup.ini index aedda37a8878..a8cf083ec04d 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/pg_profile_lookup.ini +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C8D48/pg_profile_lookup.ini @@ -1,17 +1,17 @@ # PG lossless profiles. -# speed cable size xon xoff threshold xon_offset - 10000 5m 1248 2288 35776 -3 2288 - 25000 5m 1248 2288 53248 -3 2288 - 40000 5m 1248 2288 66560 -3 2288 - 50000 5m 1248 2288 90272 -3 2288 - 100000 5m 1248 2288 165568 -3 2288 - 10000 40m 1248 2288 37024 -3 2288 - 25000 40m 1248 2288 53248 -3 2288 - 40000 40m 1248 2288 71552 -3 2288 - 50000 40m 1248 2288 96096 -3 2288 - 100000 40m 1248 2288 177632 -3 2288 - 10000 300m 1248 2288 46176 -3 2288 - 25000 300m 1248 2288 79040 -3 2288 - 40000 300m 1248 2288 108160 -3 2288 - 50000 300m 1248 2288 141856 -3 2288 - 100000 300m 1248 2288 268736 -3 2288 +# speed cable size xon xoff threshold xon_offset + 10000 5m 1024 2048 46080 -3 2048 + 25000 5m 1024 2048 65024 -3 2048 + 40000 5m 1024 2048 77056 -3 2048 + 50000 5m 1024 2048 93440 -3 2048 + 100000 5m 1024 2048 162048 -3 2048 + 10000 40m 1024 2048 47360 -3 2048 + 25000 40m 1024 2048 67840 -3 2048 + 40000 40m 1024 2048 81664 -3 2048 + 50000 40m 1024 2048 99072 -3 2048 + 100000 40m 1024 2048 173568 -3 2048 + 10000 300m 1024 2048 57088 -3 2048 + 25000 300m 1024 2048 92672 -3 2048 + 40000 300m 1024 2048 121344 -3 2048 + 50000 300m 1024 2048 148736 -3 2048 + 100000 300m 1024 2048 272640 -3 2048 diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/pg_profile_lookup.ini new file mode 100644 index 000000000000..a8cf083ec04d --- /dev/null +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/pg_profile_lookup.ini @@ -0,0 +1,17 @@ +# PG lossless profiles. +# speed cable size xon xoff threshold xon_offset + 10000 5m 1024 2048 46080 -3 2048 + 25000 5m 1024 2048 65024 -3 2048 + 40000 5m 1024 2048 77056 -3 2048 + 50000 5m 1024 2048 93440 -3 2048 + 100000 5m 1024 2048 162048 -3 2048 + 10000 40m 1024 2048 47360 -3 2048 + 25000 40m 1024 2048 67840 -3 2048 + 40000 40m 1024 2048 81664 -3 2048 + 50000 40m 1024 2048 99072 -3 2048 + 100000 40m 1024 2048 173568 -3 2048 + 10000 300m 1024 2048 57088 -3 2048 + 25000 300m 1024 2048 92672 -3 2048 + 40000 300m 1024 2048 121344 -3 2048 + 50000 300m 1024 2048 148736 -3 2048 + 100000 300m 1024 2048 272640 -3 2048 diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/pg_profile_lookup.ini new file mode 100644 index 000000000000..a8cf083ec04d --- /dev/null +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/pg_profile_lookup.ini @@ -0,0 +1,17 @@ +# PG lossless profiles. +# speed cable size xon xoff threshold xon_offset + 10000 5m 1024 2048 46080 -3 2048 + 25000 5m 1024 2048 65024 -3 2048 + 40000 5m 1024 2048 77056 -3 2048 + 50000 5m 1024 2048 93440 -3 2048 + 100000 5m 1024 2048 162048 -3 2048 + 10000 40m 1024 2048 47360 -3 2048 + 25000 40m 1024 2048 67840 -3 2048 + 40000 40m 1024 2048 81664 -3 2048 + 50000 40m 1024 2048 99072 -3 2048 + 100000 40m 1024 2048 173568 -3 2048 + 10000 300m 1024 2048 57088 -3 2048 + 25000 300m 1024 2048 92672 -3 2048 + 40000 300m 1024 2048 121344 -3 2048 + 50000 300m 1024 2048 148736 -3 2048 + 100000 300m 1024 2048 272640 -3 2048 diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/pg_profile_lookup.ini new file mode 100644 index 000000000000..a8cf083ec04d --- /dev/null +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/pg_profile_lookup.ini @@ -0,0 +1,17 @@ +# PG lossless profiles. +# speed cable size xon xoff threshold xon_offset + 10000 5m 1024 2048 46080 -3 2048 + 25000 5m 1024 2048 65024 -3 2048 + 40000 5m 1024 2048 77056 -3 2048 + 50000 5m 1024 2048 93440 -3 2048 + 100000 5m 1024 2048 162048 -3 2048 + 10000 40m 1024 2048 47360 -3 2048 + 25000 40m 1024 2048 67840 -3 2048 + 40000 40m 1024 2048 81664 -3 2048 + 50000 40m 1024 2048 99072 -3 2048 + 100000 40m 1024 2048 173568 -3 2048 + 10000 300m 1024 2048 57088 -3 2048 + 25000 300m 1024 2048 92672 -3 2048 + 40000 300m 1024 2048 121344 -3 2048 + 50000 300m 1024 2048 148736 -3 2048 + 100000 300m 1024 2048 272640 -3 2048 diff --git a/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f-C64/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f-C64/pg_profile_lookup.ini index aedda37a8878..eeb1322d6ee8 100644 --- a/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f-C64/pg_profile_lookup.ini +++ b/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f-C64/pg_profile_lookup.ini @@ -1,17 +1,17 @@ # PG lossless profiles. -# speed cable size xon xoff threshold xon_offset - 10000 5m 1248 2288 35776 -3 2288 - 25000 5m 1248 2288 53248 -3 2288 - 40000 5m 1248 2288 66560 -3 2288 - 50000 5m 1248 2288 90272 -3 2288 - 100000 5m 1248 2288 165568 -3 2288 - 10000 40m 1248 2288 37024 -3 2288 - 25000 40m 1248 2288 53248 -3 2288 - 40000 40m 1248 2288 71552 -3 2288 - 50000 40m 1248 2288 96096 -3 2288 - 100000 40m 1248 2288 177632 -3 2288 - 10000 300m 1248 2288 46176 -3 2288 - 25000 300m 1248 2288 79040 -3 2288 - 40000 300m 1248 2288 108160 -3 2288 - 50000 300m 1248 2288 141856 -3 2288 - 100000 300m 1248 2288 268736 -3 2288 +# speed cable size xon xoff threshold xon_offset + 10000 5m 1248 2288 38064 -3 2288 + 25000 5m 1248 2288 52000 -3 2288 + 40000 5m 1248 2288 64728 -3 2288 + 50000 5m 1248 2288 77168 -3 2288 + 100000 5m 1248 2288 136032 -3 2288 + 10000 40m 1248 2288 39104 -3 2288 + 25000 40m 1248 2288 54288 -3 2288 + 40000 40m 1248 2288 69472 -3 2288 + 50000 40m 1248 2288 81744 -3 2288 + 100000 40m 1248 2288 145392 -3 2288 + 10000 300m 1248 2288 47216 -3 2288 + 25000 300m 1248 2288 74464 -3 2288 + 40000 300m 1248 2288 101712 -3 2288 + 50000 300m 1248 2288 122096 -3 2288 + 100000 300m 1248 2288 225680 -3 2288 diff --git a/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f-C8D112/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f-C8D112/pg_profile_lookup.ini index aedda37a8878..eeb1322d6ee8 100644 --- a/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f-C8D112/pg_profile_lookup.ini +++ b/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f-C8D112/pg_profile_lookup.ini @@ -1,17 +1,17 @@ # PG lossless profiles. -# speed cable size xon xoff threshold xon_offset - 10000 5m 1248 2288 35776 -3 2288 - 25000 5m 1248 2288 53248 -3 2288 - 40000 5m 1248 2288 66560 -3 2288 - 50000 5m 1248 2288 90272 -3 2288 - 100000 5m 1248 2288 165568 -3 2288 - 10000 40m 1248 2288 37024 -3 2288 - 25000 40m 1248 2288 53248 -3 2288 - 40000 40m 1248 2288 71552 -3 2288 - 50000 40m 1248 2288 96096 -3 2288 - 100000 40m 1248 2288 177632 -3 2288 - 10000 300m 1248 2288 46176 -3 2288 - 25000 300m 1248 2288 79040 -3 2288 - 40000 300m 1248 2288 108160 -3 2288 - 50000 300m 1248 2288 141856 -3 2288 - 100000 300m 1248 2288 268736 -3 2288 +# speed cable size xon xoff threshold xon_offset + 10000 5m 1248 2288 38064 -3 2288 + 25000 5m 1248 2288 52000 -3 2288 + 40000 5m 1248 2288 64728 -3 2288 + 50000 5m 1248 2288 77168 -3 2288 + 100000 5m 1248 2288 136032 -3 2288 + 10000 40m 1248 2288 39104 -3 2288 + 25000 40m 1248 2288 54288 -3 2288 + 40000 40m 1248 2288 69472 -3 2288 + 50000 40m 1248 2288 81744 -3 2288 + 100000 40m 1248 2288 145392 -3 2288 + 10000 300m 1248 2288 47216 -3 2288 + 25000 300m 1248 2288 74464 -3 2288 + 40000 300m 1248 2288 101712 -3 2288 + 50000 300m 1248 2288 122096 -3 2288 + 100000 300m 1248 2288 225680 -3 2288 diff --git a/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f-Q64/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f-Q64/pg_profile_lookup.ini index aedda37a8878..eeb1322d6ee8 100644 --- a/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f-Q64/pg_profile_lookup.ini +++ b/device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f-Q64/pg_profile_lookup.ini @@ -1,17 +1,17 @@ # PG lossless profiles. -# speed cable size xon xoff threshold xon_offset - 10000 5m 1248 2288 35776 -3 2288 - 25000 5m 1248 2288 53248 -3 2288 - 40000 5m 1248 2288 66560 -3 2288 - 50000 5m 1248 2288 90272 -3 2288 - 100000 5m 1248 2288 165568 -3 2288 - 10000 40m 1248 2288 37024 -3 2288 - 25000 40m 1248 2288 53248 -3 2288 - 40000 40m 1248 2288 71552 -3 2288 - 50000 40m 1248 2288 96096 -3 2288 - 100000 40m 1248 2288 177632 -3 2288 - 10000 300m 1248 2288 46176 -3 2288 - 25000 300m 1248 2288 79040 -3 2288 - 40000 300m 1248 2288 108160 -3 2288 - 50000 300m 1248 2288 141856 -3 2288 - 100000 300m 1248 2288 268736 -3 2288 +# speed cable size xon xoff threshold xon_offset + 10000 5m 1248 2288 38064 -3 2288 + 25000 5m 1248 2288 52000 -3 2288 + 40000 5m 1248 2288 64728 -3 2288 + 50000 5m 1248 2288 77168 -3 2288 + 100000 5m 1248 2288 136032 -3 2288 + 10000 40m 1248 2288 39104 -3 2288 + 25000 40m 1248 2288 54288 -3 2288 + 40000 40m 1248 2288 69472 -3 2288 + 50000 40m 1248 2288 81744 -3 2288 + 100000 40m 1248 2288 145392 -3 2288 + 10000 300m 1248 2288 47216 -3 2288 + 25000 300m 1248 2288 74464 -3 2288 + 40000 300m 1248 2288 101712 -3 2288 + 50000 300m 1248 2288 122096 -3 2288 + 100000 300m 1248 2288 225680 -3 2288 From 105ef78ffadaf5b06467e77b30484a903811088d Mon Sep 17 00:00:00 2001 From: trzhang-msft Date: Mon, 9 Aug 2021 17:42:38 -0700 Subject: [PATCH 3/3] fix (#8393) --- src/sonic-host-services/scripts/caclmgrd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sonic-host-services/scripts/caclmgrd b/src/sonic-host-services/scripts/caclmgrd index 2d8b0b028f84..3ef3b0d0ef63 100755 --- a/src/sonic-host-services/scripts/caclmgrd +++ b/src/sonic-host-services/scripts/caclmgrd @@ -706,11 +706,12 @@ class ControlPlaneAclManager(daemon_base.DaemonBase): # Set up STATE_DB connector to monitor the change in MUX_CABLE_TABLE state_db_connector = None subscribe_mux_cable = None + state_db_id = swsscommon.SonicDBConfig.getDbId("STATE_DB") + if self.DualToR: self.log_info("Dual ToR mode") # set up state_db connector - state_db_id = swsscommon.SonicDBConfig.getDbId("STATE_DB") state_db_connector = swsscommon.DBConnector("STATE_DB", 0) subscribe_mux_cable = swsscommon.SubscriberStateTable(state_db_connector, self.MUX_CABLE_TABLE) sel.addSelectable(subscribe_mux_cable)