Move retry block to SolrTask, add comments