SRV_SEMAPHORE_WAIT_EXTENSION is still there in PS in other places.
But the code segment quoted is no longer part of the upstream code (ie. the semaphore wait addition has been removed), however it is still part of PS.
This could either be a merge regression or a fix for upstream regression (since importing tablespaces can take longer than default 600 seconds) .
If it is an upstream regression, then srv_fatal_semaphore_wait_threshold += SRV_SEMAPHORE_WAIT_EXTENSION; would be the right fix.
SRV_SEMAPHORE_ WAIT_EXTENSION is still there in PS in other places.
But the code segment quoted is no longer part of the upstream code (ie. the semaphore wait addition has been removed), however it is still part of PS.
This could either be a merge regression or a fix for upstream regression (since importing tablespaces can take longer than default 600 seconds) .
If it is an upstream regression, then srv_fatal_ semaphore_ wait_threshold += SRV_SEMAPHORE_ WAIT_EXTENSION; would be the right fix.