[SOLR-13545] ContentStreamUpdateRequest no longer closes stream

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 7.4, 7.5, 7.6, 7.7, 7.7.1, 7.7.2, 8.0, 8.1, 8.1.1
• Fix Version/s: 8.2
• Component/s: SolrJ

Environment

Windows - file locking may not cause a visible failure on Linux?

• Assignee: Unassigned
• Reporter: Colvin Cowie
• Created: 13/Jun/19 08:08
• Updated: 08/Aug/23 11:52
• Resolved: 22/Jun/19 13:04

Description

Since the change made in SOLR-12142 ContentStreamUpdateRequest no longer closes the stream that it opens. Therefore if streaming a file, it cannot be deleted until the process exits.

 

@Override
  public RequestWriter.ContentWriter getContentWriter(String expectedType) {
    if (contentStreams == null || contentStreams.isEmpty() || contentStreams.size() > 1) return null;
    ContentStream stream = contentStreams.get(0);
    return new RequestWriter.ContentWriter() {
      @Override
      public void write(OutputStream os) throws IOException {
        IOUtils.copy(stream.getStream(), os);
      }

      @Override
      public String getContentType() {
        return stream.getContentType();
      }
    };
  }

IOUtils.copy will not close the stream. Adding a close to the write(), is enough to "fix" it for the test case I've attached, e.g.

 

      @Override
      public void write(OutputStream os) throws IOException {
          final InputStream innerStream = stream.getStream();
          try {
            IOUtils.copy(innerStream, os);
          } finally {
            IOUtils.closeQuietly(innerStream);
          }
      }

 

I don't know whether any other streaming classes have similar issues

 

 

Issue Links

• is caused by: SOLR-12142 EmbeddedSolrServer should use req.getContentWriter
• links to: GitHub Pull Request #723