Merge pull request myugan#24 from yashdiq/main

enhance: add filesystem check and cleanup in MicroVM class

Author: myugan

firecracker/microvm.py

@@ -1366,6 +1366,10 @@ def _build_rootfs(self, image: str, file: str, size: str):
             if self._config.verbose:
                 self._logger.debug(f"Formatting filesystem: {file} with size {size}")
 
+            run(f"e2fsck -f -y {file}")
+            if self._config.verbose:
+                self._logger.debug(f"Filesystem check completed for: {file}")
+
             tmp_dir = tempfile.mkdtemp()
             run(f"mount -o loop {file} {tmp_dir}")
 
@@ -1376,6 +1380,11 @@ def _build_rootfs(self, image: str, file: str, size: str):
             if self._config.verbose:
                 self._logger.debug(f"Removed tar file: {tar_file}")
 
+            run(f"umount {tmp_dir}")
+            os.rmdir(tmp_dir)
+            if self._config.verbose:
+                self._logger.debug(f"Unmounted and removed temporary directory: {tmp_dir}")
+
             if self._config.verbose:
                 self._logger.info("Build rootfs completed")
 

firecracker/network.py

@@ -727,9 +727,15 @@ def add_port_forward(self, id: str, host_ip: str, host_port: int, dest_ip: str,
 
         try:
             for rule in rules["nftables"]:
-                rc, output, error = self._nft.json_cmd({"nftables": [rule]})
-                if rc != 0 and "File exists" not in str(error):
-                    raise NetworkError(f"Failed to add port forwarding rule: {error}")
+                rc, _, error = self._nft.json_cmd({"nftables": [rule]})
+                if rc != 0:
+                    error_str = str(error)
+                    ignore_errors = [
+                        "File exists",
+                        "already exists",
+                    ]
+                    if not any(err in error_str for err in ignore_errors):
+                        raise NetworkError(f"Failed to add port forwarding rule: {error}")
 
             if self._config.verbose:
                 self._logger.info(f"Added port forwarding rule: {host_ip}:{host_port} -> {dest_ip}:{dest_port}")