Storage-entries not marked as processed by cron

We are currently having issues with the cron-hook of storage_api.

If i run the SQL from _storage_check_files manually i get 379.447 entries that cron should go through. This number never seems to drop, only increase, and the cron-run never succeeds.

I think i have located the source of the problem in storage.inc line 712:

  // If the storage has a single instance in a container that is not
  // propagating, then we are done.
  if ($this->file_id) {
    $query = db_select('storage_instance');
    $query->join('storage_class_container', NULL, 'storage_instance.container_id = storage_class_container.container_id');
    $query->join('storage_selector', NULL, 'storage_class_container.class_id = storage_selector.class_id');

    $count = $query->condition('storage_instance.file_id', $this->file_id)
      ->condition('storage_class_container.propagate', 0)
      ->condition('storage_selector.selector_id', $this->selector_id)
      ->countQuery()
      ->execute()
      ->fetchField();

    if ($count) {
      return;
    }

If the last condition is true, the file is still marked as one that should be processed by cron, and will probably return in the same result the next time.

This does not seem right. Maybe it should mark this storage as idle (STORAGE_STATUS_IDLE) as it is on line 779:

  if ($this->selector_id) {
    $this->initial_container_id = NULL;
    $this->status = STORAGE_STATUS_IDLE;
    $this->update();
  }