> On Jan. 20, 2017, 11:37 p.m., Bruce Schuchardt wrote: > > geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java, > > line 1578 > > <https://reviews.apache.org/r/55742/diff/3/?file=1611029#file1611029line1578> > > > > Something more like > > boolean ignoredInterrupt = false; > > . > > . > > . > > } catch (InterruptedException ignore) { > > ignoredInterrupt = true; > > } > > _finish shutting down other pool_ > > if (ignoredInterrupt) { > > Thread.currentThread().interrupt(); > > } > > return;
I've added test hooks to `AcceptorImpl.close()` and made a test that will avoid short-circuiting when interrupted. I'm planning to leave the interrupt code as is unless you have a strong objection. - Galen ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/55742/#review162521 ----------------------------------------------------------- On Jan. 20, 2017, 11:20 p.m., Galen O'Sullivan wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/55742/ > ----------------------------------------------------------- > > (Updated Jan. 20, 2017, 11:20 p.m.) > > > Review request for geode, Bruce Schuchardt, Hitesh Khamesra, and Udo > Kohlmeyer. > > > Bugs: GEODE-2324 > https://issues.apache.org/jira/browse/GEODE-2324 > > > Repository: geode > > > Description > ------- > > [GEODE-2324] fix AcceptorImpl cleanup. > > * Catch InterruptedException so cleanup continues. > * Remove top-level exception handler to avoid similar mistakes in the future. > * Fix a synchronization bug that could cause AcceptorImpl to try to shut down > twice. > * Fix what looks like a bug where if closing the socket throws and > IOException, we fail to shut anything else down, though we still have > ourselves marked as shut down. > > I'm a little skeptical of whether we're waiting at all for the queue to shut > down, as the thread could have been marked as interrupted for quite a while > before and never noticed it until the thread got parked. This may warrant > more investigation. > > > Diffs > ----- > > > geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java > 060683de6 > > Diff: https://reviews.apache.org/r/55742/diff/ > > > Testing > ------- > > precheckin in progress. > > > Thanks, > > Galen O'Sullivan > >
