Thermal policy

device/mellanox/x86_64-mlnx_lssn2700-r0/thermal_policy.json

@@ -0,0 +1 @@
+../x86_64-mlnx_msn2700-r0/thermal_policy.json

device/mellanox/x86_64-mlnx_msn2010-r0/thermal_policy.json

@@ -0,0 +1 @@
+../x86_64-mlnx_msn2700-r0/thermal_policy.json

device/mellanox/x86_64-mlnx_msn2100-r0/thermal_policy.json

@@ -0,0 +1 @@
+../x86_64-mlnx_msn2700-r0/thermal_policy.json

device/mellanox/x86_64-mlnx_msn2410-r0/thermal_policy.json

@@ -0,0 +1 @@
+../x86_64-mlnx_msn2700-r0/thermal_policy.json

device/mellanox/x86_64-mlnx_msn2700-r0/thermal_policy.json

@@ -0,0 +1,65 @@
+{
+    "info_types": [
+        {
+            "type": "fan_info"
+        },
+        {
+            "type": "psu_info"
+        }
+    ],
+    "policies": [
+        {
+            "name": "any fan absence",
+            "conditions": [
+                {
+                    "type": "fan.any.absence"
+                }
+            ],
+            "actions": [
+                {
+                    "type": "thermal_control.control",
+                    "status": "false"
+                },
+                {
+                    "type": "fan.all.set_speed",
+                    "speed": "100"
+                }
+            ]
+        },
+        {
+            "name": "any psu absence",
+            "conditions": [
+                {
+                    "type": "psu.any.absence"
+                }
+            ],
+            "actions": [
+                {
+                    "type": "thermal_control.control",
+                    "status": "false"
+                },
+                {
+                    "type": "fan.all.set_speed",
+                    "speed": "100"
+                }
+            ]
+        },
+        {
+            "name": "all fan and psu presence",
+            "conditions": [
+                {
+                    "type": "fan.all.presence"
+                },
+                {
+                    "type": "psu.all.presence"
+                }
+            ],
+            "actions": [
+                {
+                    "type": "thermal_control.control",
+                    "status": "true"
+                }
+            ]
+        }
+    ]
+}

device/mellanox/x86_64-mlnx_msn2700_simx-r0/thermal_policy.json

@@ -0,0 +1 @@
+../x86_64-mlnx_msn2700-r0/thermal_policy.json

device/mellanox/x86_64-mlnx_msn2740-r0/thermal_policy.json

@@ -0,0 +1 @@
+../x86_64-mlnx_msn2700-r0/thermal_policy.json

device/mellanox/x86_64-mlnx_msn3700-r0/thermal_policy.json

@@ -0,0 +1 @@
+../x86_64-mlnx_msn2700-r0/thermal_policy.json

device/mellanox/x86_64-mlnx_msn3700_simx-r0/thermal_policy.json

@@ -0,0 +1 @@
+../x86_64-mlnx_msn2700-r0/thermal_policy.json

device/mellanox/x86_64-mlnx_msn3700c-r0/thermal_policy.json

@@ -0,0 +1 @@
+../x86_64-mlnx_msn2700-r0/thermal_policy.json

device/mellanox/x86_64-mlnx_msn3800-r0/thermal_policy.json

@@ -0,0 +1 @@
+../x86_64-mlnx_msn2700-r0/thermal_policy.json

dockers/docker-dhcp-relay/start.sh

@@ -16,6 +16,12 @@ if [ $(supervisorctl status | grep -c "^isc-dhcp-relay:") -gt 0 ]; then
     # lifetime of the process.
     /usr/bin/wait_for_intf.sh
 
+    # Allow a bit more time for interfaces to settle before starting the
+    # relay agent processes.
+    # FIXME: Remove/decrease this once we determine how to prevent future race
+    # conditions here.
+    sleep 180
+
     # Start all DHCP relay agent(s)
     supervisorctl start isc-dhcp-relay:*
 fi

files/build_templates/dhcp_relay.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=DHCP relay container
-Requires=updategraph.service swss.service teamd.service
+Requires=updategraph.service
 After=updategraph.service swss.service syncd.service teamd.service
 Before=ntp-config.service
 StartLimitIntervalSec=1200
@@ -15,4 +15,4 @@ Restart=always
 RestartSec=30
 
 [Install]
-WantedBy=multi-user.target swss.service teamd.service
+WantedBy=multi-user.target

files/build_templates/sonic_debian_extension.j2

@@ -253,6 +253,11 @@ sudo cp $IMAGE_CONFIGS/caclmgrd/caclmgrd.service  $FILESYSTEM_ROOT/etc/systemd/s
 echo "caclmgrd.service" | sudo tee -a $GENERATED_SERVICE_FILE
 sudo cp $IMAGE_CONFIGS/caclmgrd/caclmgrd $FILESYSTEM_ROOT/usr/bin/
 
+# Copy process/docker cpu/memory utilization data export daemon
+sudo cp $IMAGE_CONFIGS/procdockerstatsd/procdockerstatsd.service  $FILESYSTEM_ROOT/etc/systemd/system/
+echo "procdockerstatsd.service" | sudo tee -a $GENERATED_SERVICE_FILE
+sudo cp $IMAGE_CONFIGS/procdockerstatsd/procdockerstatsd $FILESYSTEM_ROOT/usr/bin/
+
 # Copy process-reboot-cause service files
 sudo cp $IMAGE_CONFIGS/process-reboot-cause/process-reboot-cause.service  $FILESYSTEM_ROOT/etc/systemd/system/
 echo "process-reboot-cause.service" | sudo tee -a $GENERATED_SERVICE_FILE

files/image_config/hostcfgd/hostcfgd

@@ -304,13 +304,53 @@ class HostConfigDaemon:
             add = False
 
         self.iptables.iptables_handler(key, data, add)
+
+    def feature_status_handler(self, key, data):
+        status_data = self.config_db.get_table('FEATURE')
+        for key in status_data.keys():
+            if not key:
+                syslog.syslog(syslog.LOG_WARNING, "FEATURE key is missing")
+                return
+        status = status_data[key]['status']
+        if not status:
+            syslog.syslog(syslog.LOG_WARNING, "status is missing for {}".format(key))
+            return
+        if status == "enabled":
+            start_cmds=[]
+            start_cmds.append("sudo systemctl enable {}".format(key))
+            start_cmds.append("sudo systemctl start {}".format(key))
+            for cmd in start_cmds:
+                syslog.syslog(syslog.LOG_INFO, "Running cmd - {}".format(cmd))
+                try:
+                    subprocess.check_call(cmd, shell=True)
+                except subprocess.CalledProcessError as err:
+                    syslog.syslog(syslog.LOG_ERR, "{} - failed: return code - {}, output:\n{}"
+                              .format(err.cmd, err.returncode, err.output))
+                    return
+            syslog.syslog(syslog.LOG_INFO, "Feature '{}' is enabled and started".format(key))
+        elif status == "disabled":
+            stop_cmds=[]
+            stop_cmds.append("sudo systemctl stop {}".format(key))
+            stop_cmds.append("sudo systemctl disable {}".format(key))
+            for cmd in stop_cmds:
+                syslog.syslog(syslog.LOG_INFO, "Running cmd - {}".format(cmd))
+                try:
+                    subprocess.check_call(cmd, shell=True)
+                except subprocess.CalledProcessError as err:
+                    syslog.syslog(syslog.LOG_ERR, "{} - failed: return code - {}, output:\n{}"
+                              .format(err.cmd, err.returncode, err.output))
+                    return
+            syslog.syslog(syslog.LOG_INFO, "Feature '{}' is stopped and disabled".format(key))
+        else:
+            syslog.syslog(syslog.LOG_ERR, "Unexpected status value '{}' for '{}'".format(status, key))
 
     def start(self):
         self.config_db.subscribe('AAA', lambda table, key, data: self.aaa_handler(key, data))
         self.config_db.subscribe('TACPLUS_SERVER', lambda table, key, data: self.tacacs_server_handler(key, data))
         self.config_db.subscribe('TACPLUS', lambda table, key, data: self.tacacs_global_handler(key, data))
         self.config_db.subscribe('DEVICE_METADATA', lambda table, key, data: self.hostname_handler(key, data))
         self.config_db.subscribe('LOOPBACK_INTERFACE', lambda table, key, data: self.lpbk_handler(key, data))
+        self.config_db.subscribe('FEATURE', lambda table, key, data: self.feature_status_handler(key, data))
         self.config_db.listen()
 
 
@@ -321,4 +361,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-