Fix fio_object_storage filenames to refer to prefilled filenames. Also install blobfuse2 via git (and pin to 2.5.0).

PiperOrigin-RevId: 829638249

Author: andyz422

perfkitbenchmarker/linux_benchmarks/fio/fio_object_storage_benchmark.py

@@ -19,7 +19,6 @@
 from perfkitbenchmarker.linux_benchmarks.fio import constants
 from perfkitbenchmarker.linux_benchmarks.fio import flags as fio_flags
 from perfkitbenchmarker.linux_benchmarks.fio import utils
-from perfkitbenchmarker.linux_packages import fio
 
 
 FLAGS = flags.FLAGS
@@ -57,7 +56,7 @@ def GetConfig(user_config):
 def Prepare(spec: benchmark_spec.BenchmarkSpec):
   vm = spec.vms[0]
   vm.Install('fio')
-  utils.PrefillIfEnabled(vm, fio.GetFioExec(), use_directory=True)
+  utils.PrefillIfEnabled(vm, constants.FIO_PATH, use_directory=True)
 
 
 def Run(spec: benchmark_spec.BenchmarkSpec) -> list[sample.Sample]:

perfkitbenchmarker/linux_benchmarks/fio/utils.py

@@ -64,10 +64,11 @@ def GetFilename(disks, device_path=None):
   else:
     # Since we pass --directory to fio, we must use relative file
     # paths or get an error.
-    filename_base = f'{_FILENAME_PREFIX}.'
+    # TODO(andytzhu): Support multiple numjobs.
+    filename_base = f'{_FILENAME_PREFIX}.0'
     filenames = []
     for filenum in range(fio_flags.FIO_NR_FILES.value):
-      filenames.append(f'{filename_base}{filenum}')
+      filenames.append(f'{filename_base}.{filenum}')
     filename = ':'.join(filenames)
 
   return filename
@@ -194,6 +195,8 @@ def FillDevice(vm, disk, fill_size, exec_path, use_directory=False):
       '--create_on_open=1'
   )
   vm.RobustRemoteCommand(command)
+  # Clear the OS page cache
+  vm.RobustRemoteCommand('sudo sh -c "echo 3 > /proc/sys/vm/drop_caches"')
 
 
 def PrefillIfEnabled(vm, exec_path, use_directory=False):

perfkitbenchmarker/linux_packages/blobfuse2.py

@@ -13,19 +13,20 @@
 # limitations under the License.
 """Module for installing the Blobfuse2 package."""
 
-from perfkitbenchmarker import os_types
 
-
-_UBUNTU24_PACKAGE_REPO = 'https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb'
+_BLOBFUSE2_REPO_URL = 'https://github.com/Azure/azure-storage-fuse.git'
+_BLOBFUSE2_REPO_NAME = 'azure-storage-fuse'
+_BLOBFUSE2_VERSION = 'blobfuse2-2.5.0'
 
 
 def AptInstall(vm):
   """Installs Blobfuse2 on the VM."""
-  if vm.OS_TYPE != os_types.UBUNTU2404:
-    raise NotImplementedError(
-        'Only installation of Blobfuse2 on Ubuntu 24.04 is supported.'
-    )
-  vm.InstallPackages('wget')
-  vm.RemoteCommand(f'sudo wget {_UBUNTU24_PACKAGE_REPO}')
-  vm.RemoteCommand('sudo dpkg -i packages-microsoft-prod.deb')
-  vm.InstallPackages('libfuse3-dev fuse3 blobfuse2')
+  vm.InstallPackages('golang-go libfuse3-dev fuse3')
+  vm.RemoteCommand(f'git clone {_BLOBFUSE2_REPO_URL}')
+  vm.RemoteCommand(
+      f'cd {_BLOBFUSE2_REPO_NAME} && git checkout {_BLOBFUSE2_VERSION} &&'
+      ' ./build.sh'
+  )
+  vm.RemoteCommand(
+      f'sudo cp {_BLOBFUSE2_REPO_NAME}/blobfuse2 /usr/local/bin/'
+  )

tests/fio_util_test.py

@@ -41,7 +41,7 @@ def testGetFilenameForDisk(self):
 
   @flagsaver.flagsaver(fio_target_mode='against_file_with_fill')
   def testGetFilenameForDiskWorFile(self):
-    self.assertEqual(utils.GetFilename(self.disks), 'fill-device.0')
+    self.assertEqual(utils.GetFilename(self.disks), 'fill-device.0.0')
 
   def testGetAllDiskPaths(self):
     test_disk = self.disks[0]