harshkha3417 commented on PR #7765:
URL: https://github.com/apache/shenyu/pull/7765#issuecomment-6258078286
Rebased onto latest `master` and resolved all conflicts with zero warnings
or regressions:
### Summary of Resolution & Updates
1. **`ShenyuClusterService`**:
- Resolved merge conflict with #7782 by unifying `shutdown()` handling:
preserved `shutdownNow()` with `SHUTDOWN_WAIT_SECONDS = 5L`, termination
timeout/interrupt logging, and executor null-safety.
- Preserved periodic task resilience: uncaught exceptions during
election/renewal no longer terminate the scheduler, consecutive error count is
tracked via `getSelectMasterErrorCount()`, and `releaseMaster()` is executed
symmetrically only when leadership was acquired.
2. **`ShenyuClusterServiceTest`**:
- Combined test cases from both #7782 and #7765 into a unified suite
covering shutdown lifecycle (pre-start shutdown safety, scheduler termination,
renewal interruption) as well as exception resilience (continued election after
failure, renewal recovery, and consecutive failure metric tracking).
3. **`InstanceCheckService` & Tests**:
- Preserved per-instance error isolation in `syncDB()` so a single
failing instance write does not starve remaining instances.
- Synchronized heartbeat updates with #7785's
`InstanceInfoUtils.normalize` and updated the corresponding test fixtures to
valid JSON objects.
--
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]
