Check & remove extra chunks for degraded / incomplete objects, too

src/osd_primary.cpp

@@ -365,9 +365,8 @@ resume_7:
                 recovery_stat_bytes[0][recovery_type] += op_data->stripes[role].write_end - op_data->stripes[role].write_start;
             }
         }
-        if (op_data->object_state->state & OBJ_MISPLACED)
-        {
-            // Remove extra chunks
+        // Any kind of a non-clean object can have extra chunks, because we don't record objects
+        // as degraded & misplaced or incomplete & misplaced at the same time. So try to remove extra chunks
         submit_primary_del_subops(cur_op, pg.cur_set.data(), pg.pg_size, op_data->object_state->osd_set);
         if (op_data->n_subops > 0)
         {
@@ -381,7 +380,6 @@ resume_9:
                 return;
             }
         }
-        }
         // Clear object state
         remove_object_from_state(op_data->oid, op_data->object_state, pg);
         pg.clean_count++;