rmdmattingly commented on code in PR #5461: URL: https://github.com/apache/hbase/pull/5461#discussion_r1356892819
########## hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java: ########## @@ -718,14 +720,19 @@ public static void closeRegionSilentlyAndWait(ClusterConnection connection, Serv public AdminService.BlockingInterface getRsAdmin(final ServerName sn) throws IOException { AdminService.BlockingInterface admin = this.rsAdmins.get(sn); if (admin == null) { - LOG.debug("New admin connection to " + sn.toString()); - if (sn.equals(master.getServerName()) && master instanceof HRegionServer) { - // A master is also a region server now, see HBASE-10569 for details - admin = ((HRegionServer) master).getRSRpcServices(); - } else { - admin = this.connection.getAdmin(sn); - } - this.rsAdmins.put(sn, admin); + return this.rsAdmins.computeIfAbsent(sn, server -> { + LOG.debug("New admin connection to " + server.toString()); + if (server.equals(master.getServerName()) && master instanceof HRegionServer) { + // A master is also a region server now, see HBASE-10569 for details + return ((HRegionServer) master).getRSRpcServices(); + } else { + try { + return this.connection.getAdmin(server); + } catch (IOException e) { + throw new RuntimeException(e); Review Comment: Yeah, good point -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@hbase.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org