errose28 commented on code in PR #10033:
URL: https://github.com/apache/ozone/pull/10033#discussion_r3157293868
##########
hadoop-ozone/dist/src/main/compose/upgrade/upgrades/rolling-upgrade/callbacks/common/callback.sh:
##########
@@ -20,9 +20,43 @@ source "$TEST_DIR"/testlib.sh
### CALLBACKS ###
before_service_restart() {
- generate "generate-${SERVICE}" "$CLIENT"
+ generate "generate-${SERVICE}-${STAGE_PREFIX}" "$CLIENT"
Review Comment:
To reduce the amount of global env variables, `STAGE_PREFIX` and `SERVICE`
and be combined into a single `prefix` string that is assembled by the driver
and then passed into this function as a parameter.
We can also pass `STAGE_PREFIX` as a parameter from
`rolling_restart_all_services` into `rolling_restart_service` where the final
prefix is assembled.
##########
hadoop-ozone/dist/src/main/compose/upgrade/upgrades/rolling-upgrade/callbacks/common/callback.sh:
##########
@@ -20,9 +20,43 @@ source "$TEST_DIR"/testlib.sh
### CALLBACKS ###
before_service_restart() {
- generate "generate-${SERVICE}" "$CLIENT"
+ generate "generate-${SERVICE}-${STAGE_PREFIX}" "$CLIENT"
}
after_service_restart() {
- validate "generate-${SERVICE}" "$CLIENT"
+ validate "generate-${SERVICE}-${STAGE_PREFIX}" "$CLIENT"
+}
+
+with_old_version() {
+ execute_robot_test "$SCM" -N "${OUTPUT_NAME}-check-finalization" --include
finalized upgrade/check-finalization.robot
+ generate old1
+ validate old1
+}
+
+with_this_version_pre_finalized() {
Review Comment:
The non-rolling upgrade has a test for key overwrite as well. I think we
should add that here. We can do it as a separate generate/validate step which
will be clearer than what the non-rolling suite does now. For example:
```
# In the old version:
generate overwrite
# In all following callbacks:
validate overwrite
generate overwrite
```
##########
hadoop-ozone/dist/src/main/compose/upgrade/upgrades/rolling-upgrade/callbacks/common/callback.sh:
##########
@@ -20,9 +20,43 @@ source "$TEST_DIR"/testlib.sh
### CALLBACKS ###
before_service_restart() {
- generate "generate-${SERVICE}" "$CLIENT"
+ generate "generate-${SERVICE}-${STAGE_PREFIX}" "$CLIENT"
}
after_service_restart() {
- validate "generate-${SERVICE}" "$CLIENT"
+ validate "generate-${SERVICE}-${STAGE_PREFIX}" "$CLIENT"
+}
+
+with_old_version() {
+ execute_robot_test "$SCM" -N "${OUTPUT_NAME}-check-finalization" --include
finalized upgrade/check-finalization.robot
Review Comment:
This should run on `CLIENT` not `SCM` right? If so, the requirement that
`SCM` is set can be removed from the top of `driver.sh`.
##########
hadoop-ozone/dist/src/main/compose/upgrade/upgrades/rolling-upgrade/callbacks/common/callback.sh:
##########
@@ -20,9 +20,43 @@ source "$TEST_DIR"/testlib.sh
### CALLBACKS ###
before_service_restart() {
Review Comment:
I think these names are somewhat confusing because `before_service_restart`
is actually run when the service is stopped but before it is started. Maybe we
change these names to something like `with_service_stopped` and
`with_service_restarted`.
--
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]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
