@@ -388,7 +388,7 @@ public TSStatus deleteTimeSeries(
388388 this .executor .submitProcedure (procedure );
389389 }
390390 }
391- return waitingProcedureFinished (procedure );
391+ return waitingProcedureFinished (procedure , PROCEDURE_WAIT_TIME_OUT << 1 );
392392 }
393393
394394 public TSStatus deleteLogicalView (TDeleteLogicalViewReq req ) {
@@ -1515,16 +1515,16 @@ public void createConsensusPipeAsync(TCreatePipeReq req) {
15151515
15161516 public TSStatus createPipe (TCreatePipeReq req ) {
15171517 try {
1518- CreatePipeProcedureV2 procedure = new CreatePipeProcedureV2 (req );
1518+ final CreatePipeProcedureV2 procedure = new CreatePipeProcedureV2 (req );
15191519 executor .submitProcedure (procedure );
1520- TSStatus status = waitingProcedureFinished (procedure );
1520+ final TSStatus status = waitingProcedureFinished (procedure , PROCEDURE_WAIT_TIME_OUT << 1 );
15211521 if (status .getCode () == TSStatusCode .SUCCESS_STATUS .getStatusCode ()) {
15221522 return status ;
15231523 } else {
15241524 return new TSStatus (TSStatusCode .PIPE_ERROR .getStatusCode ())
15251525 .setMessage (wrapTimeoutMessageForPipeProcedure (status .getMessage ()));
15261526 }
1527- } catch (Exception e ) {
1527+ } catch (final Exception e ) {
15281528 return new TSStatus (TSStatusCode .PIPE_ERROR .getStatusCode ()).setMessage (e .getMessage ());
15291529 }
15301530 }
@@ -1533,14 +1533,14 @@ public TSStatus alterPipe(final TAlterPipeReq req) {
15331533 try {
15341534 final AlterPipeProcedureV2 procedure = new AlterPipeProcedureV2 (req );
15351535 executor .submitProcedure (procedure );
1536- TSStatus status = waitingProcedureFinished (procedure );
1536+ final TSStatus status = waitingProcedureFinished (procedure , PROCEDURE_WAIT_TIME_OUT << 1 );
15371537 if (status .getCode () == TSStatusCode .SUCCESS_STATUS .getStatusCode ()) {
15381538 return status ;
15391539 } else {
15401540 return new TSStatus (TSStatusCode .PIPE_ERROR .getStatusCode ())
15411541 .setMessage (wrapTimeoutMessageForPipeProcedure (status .getMessage ()));
15421542 }
1543- } catch (Exception e ) {
1543+ } catch (final Exception e ) {
15441544 return new TSStatus (TSStatusCode .PIPE_ERROR .getStatusCode ()).setMessage (e .getMessage ());
15451545 }
15461546 }
@@ -1624,9 +1624,9 @@ public void dropConsensusPipeAsync(String pipeName) {
16241624
16251625 public TSStatus dropPipe (String pipeName ) {
16261626 try {
1627- DropPipeProcedureV2 procedure = new DropPipeProcedureV2 (pipeName );
1627+ final DropPipeProcedureV2 procedure = new DropPipeProcedureV2 (pipeName );
16281628 executor .submitProcedure (procedure );
1629- TSStatus status = waitingProcedureFinished (procedure );
1629+ final TSStatus status = waitingProcedureFinished (procedure , PROCEDURE_WAIT_TIME_OUT << 1 );
16301630 if (status .getCode () == TSStatusCode .SUCCESS_STATUS .getStatusCode ()) {
16311631 return status ;
16321632 } else {
@@ -1881,13 +1881,18 @@ private TSStatus waitingProcedureFinished(final long procedureId) {
18811881 return waitingProcedureFinished (executor .getProcedures ().get (procedureId ));
18821882 }
18831883
1884+ protected TSStatus waitingProcedureFinished (final Procedure <?> procedure ) {
1885+ return waitingProcedureFinished (procedure , PROCEDURE_WAIT_TIME_OUT );
1886+ }
1887+
18841888 /**
18851889 * Waiting until the specific procedure finished.
18861890 *
18871891 * @param procedure The specific procedure
18881892 * @return TSStatus the running result of this procedure
18891893 */
1890- protected TSStatus waitingProcedureFinished (Procedure <?> procedure ) {
1894+ protected TSStatus waitingProcedureFinished (
1895+ Procedure <?> procedure , final long procedureWaitRetryTimeout ) {
18911896 if (procedure == null ) {
18921897 LOGGER .error ("Unexpected null procedure parameters for waitingProcedureFinished" );
18931898 return RpcUtils .getStatus (TSStatusCode .INTERNAL_SERVER_ERROR );
@@ -1896,7 +1901,7 @@ protected TSStatus waitingProcedureFinished(Procedure<?> procedure) {
18961901 final long startTimeForCurrentProcedure = System .currentTimeMillis ();
18971902 while (executor .isRunning ()
18981903 && !executor .isFinished (procedure .getProcId ())
1899- && System .currentTimeMillis () - startTimeForCurrentProcedure < PROCEDURE_WAIT_TIME_OUT ) {
1904+ && System .currentTimeMillis () - startTimeForCurrentProcedure < procedureWaitRetryTimeout ) {
19001905 sleepWithoutInterrupt (PROCEDURE_WAIT_RETRY_TIMEOUT );
19011906 }
19021907 if (!procedure .isFinished ()) {
0 commit comments