Storage selector fixes

Karasiq · Apr 17, 2020 · 9029c98 · 9029c98
1 parent 6223bfe
commit 9029c98
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...n/scala/com/karasiq/shadowcloud/storage/replication/selectors/SimpleStorageSelector.scala b/...n/scala/com/karasiq/shadowcloud/storage/replication/selectors/SimpleStorageSelector.scala
@@ -57,7 +57,7 @@ class SimpleStorageSelector(region: RegionContext) extends StorageSelector {
     chunk.writeStatus match {
       case WriteStatus.Pending(affinity) ⇒
         val newList = affinity.mandatory.filterNot(chunk.availability.isFailed) ++ generatedList
-        affinity.copy(mandatory = (selectStoragesToWrite(newList) ++ settings.writeInclude).distinct)
+        affinity.copy(mandatory = (selectStoragesToWrite(newList)).distinct)
 
       case _ ⇒
         ChunkWriteAffinity(selectStoragesToWrite(generatedList))
@@ -75,6 +75,6 @@ class SimpleStorageSelector(region: RegionContext) extends StorageSelector {
   }
 
   protected def selectStoragesToWrite(storages: Seq[StorageId]): Seq[StorageId] = {
-    Utils.takeOrAll(sortStorages(storages.distinct), settings.dataRF)
+    Utils.takeOrAll(sortStorages(storages.filterNot(settings.writeInclude).distinct), settings.dataRF) ++ settings.writeInclude
   }
 }