junegunn opened a new pull request, #8175:
URL: https://github.com/apache/hbase/pull/8175

   Conflict in `HRegionServer.java` constructor. Two adaptations needed:
   
   1. **Kept branch-2.5's `initNamedQueueRecorder(conf)` helper** instead of 
the inline `namedQueueRecorder = NamedQueueRecorder.getInstance(...)` from the 
upstream commit.
   2. **Stripped the HBASE-27304 useIp branch from `resolveHostName()`.** 
`HConstants.HBASE_SERVER_USEIP_ENABLED_KEY`/`DEFAULT` don't exist in 
branch-2.5, so `resolveHostName` falls back to `DNS.getHostname(conf, 
getDNSServerType())` directly.
   


-- 
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: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to