(#2) passing test ++

wrench-project · Oct 8, 2019 · 1600c00 · 1600c00
1 parent e4bbe7c
commit 1600c00
Show file tree

Hide file tree

Showing 6 changed files with 772 additions and 748 deletions.
diff --git a/src/wrench/services/compute/bare_metal/BareMetalComputeService.cpp b/src/wrench/services/compute/bare_metal/BareMetalComputeService.cpp
@@ -1147,7 +1147,7 @@ namespace wrench {
 
         this->releaseDaemonLock();
 
-        // If the job not done, just return
+        // If the job is not done, just return
         if (this->completed_workunits[job].size() != this->all_workunits[job].size()) {
             return;
         }

diff --git a/src/wrench/services/compute/work_unit_executor/WorkunitExecutor.cpp b/src/wrench/services/compute/work_unit_executor/WorkunitExecutor.cpp
@@ -370,6 +370,7 @@ namespace wrench {
                         files_to_write[f] = work->file_locations[f];
                     } else {
                         files_to_write[f] = FileLocation::LOCATION(this->scratch_space, this->scratch_space->getMountPoint() + "/" + job->getName());
+                        this->files_stored_in_scratch.insert(f);
                     }
                 }
                 StorageService::writeFiles(files_to_write);

diff --git a/src/wrench/services/storage/StorageService.cpp b/src/wrench/services/storage/StorageService.cpp
@@ -662,7 +662,7 @@ namespace wrench {
         if (this->hasMultipleMountPoints()) {
             throw std::invalid_argument("StorageService::getAbsolutePath(): The storage service has more than one mount point");
         }
-        return this->file_systems.begin()->first;
+        return wrench::FileLocation::sanitizePath(this->file_systems.begin()->first);
     }
 
 

diff --git a/src/wrench/services/storage/simple/SimpleStorageService.cpp b/src/wrench/services/storage/simple/SimpleStorageService.cpp
@@ -617,8 +617,11 @@ namespace wrench {
 
         if ((not fs->doesDirectoryExist(location->getAbsolutePathAtMountPoint())) or
             (not fs->isFileInDirectory(file, location->getAbsolutePathAtMountPoint()))) {
-            failure_cause = std::shared_ptr<FailureCause>(
-                    new FileNotFound(file, location));
+            // If this is scratch, we don't care, perhaps it was taken care of elsewhere...
+            if (not this->isScratch()) {
+               failure_cause = std::shared_ptr<FailureCause>(
+                       new FileNotFound(file, location));
+           }
         } else {
             fs->removeFileFromDirectory(file, location->getAbsolutePathAtMountPoint());
         }

diff --git a/src/wrench/services/storage/storage_helpers/LogicalFileSystem.cpp b/src/wrench/services/storage/storage_helpers/LogicalFileSystem.cpp
@@ -116,7 +116,7 @@ namespace wrench {
             createDirectory(absolute_path);
         }
 
-        this->content[absolute_path].insert(file);
+      this->content[absolute_path].insert(file);
         std::string key = FileLocation::sanitizePath(absolute_path) + file->getID();
         if (this->reserved_space.find(key) == this->reserved_space.end()) {
             this->occupied_space += file->getSize();