|
26 | 26 | import java.io.IOException; |
27 | 27 | import java.util.HashMap; |
28 | 28 | import java.util.Map; |
| 29 | +import java.util.concurrent.TimeUnit; |
29 | 30 | import java.util.concurrent.TimeoutException; |
| 31 | +import org.awaitility.Awaitility; |
30 | 32 | import org.testng.annotations.Test; |
31 | 33 |
|
32 | 34 | /** |
@@ -121,24 +123,47 @@ private void doTestExchangeDeclaredWithEnumerationEquivalent(Channel channel) |
121 | 123 | for (BuiltinExchangeType exchangeType : BuiltinExchangeType.values()) { |
122 | 124 | channel.exchangeDeclare(NAME, exchangeType); |
123 | 125 | verifyEquivalent(NAME, exchangeType.getType(), false, false, null); |
124 | | - channel.exchangeDelete(NAME); |
| 126 | + deleteExchangeWithRetry(); |
125 | 127 |
|
126 | 128 | channel.exchangeDeclare(NAME, exchangeType, false); |
127 | 129 | verifyEquivalent(NAME, exchangeType.getType(), false, false, null); |
128 | | - channel.exchangeDelete(NAME); |
| 130 | + deleteExchangeWithRetry(); |
129 | 131 |
|
130 | 132 | channel.exchangeDeclare(NAME, exchangeType, false, false, null); |
131 | 133 | verifyEquivalent(NAME, exchangeType.getType(), false, false, null); |
132 | | - channel.exchangeDelete(NAME); |
| 134 | + deleteExchangeWithRetry(); |
133 | 135 |
|
134 | 136 | channel.exchangeDeclare(NAME, exchangeType, false, false, false, null); |
135 | 137 | verifyEquivalent(NAME, exchangeType.getType(), false, false, null); |
136 | | - channel.exchangeDelete(NAME); |
| 138 | + deleteExchangeWithRetry(); |
137 | 139 |
|
138 | 140 | channel.exchangeDeclareNoWait(NAME, exchangeType, false, |
139 | 141 | false, false, null); |
140 | 142 | // no check, this one is asynchronous |
141 | | - channel.exchangeDelete(NAME); |
| 143 | + deleteExchangeWithRetry(); |
142 | 144 | } |
143 | 145 | } |
| 146 | + |
| 147 | + public void deleteExchangeWithRetry() throws IOException { |
| 148 | + // the replicator cursor of exchange is created in async way, |
| 149 | + // delete the exchange may fail due to non-empty directory error |
| 150 | + // |
| 151 | + // KeeperErrorCode = Directory not empty for |
| 152 | + // /managed-ledgers/public/vhost1/persistent/__amqp_exchange__exchange_test |
| 153 | + // |
| 154 | + // - /managed-ledgers/public/vhost1/persistent/__amqp_exchange__exchange_test |
| 155 | + // - /managed-ledgers/public/vhost1/persistent/__amqp_exchange__exchange_test/__amqp_replicator__exchange_test |
| 156 | + Awaitility.await() |
| 157 | + .atMost(5, TimeUnit.SECONDS) |
| 158 | + .pollInterval(100, TimeUnit.MILLISECONDS) |
| 159 | + .until(() -> { |
| 160 | + try { |
| 161 | + channel.exchangeDelete(NAME); |
| 162 | + } catch (Exception e) { |
| 163 | + return false; |
| 164 | + } |
| 165 | + return true; |
| 166 | + }); |
| 167 | + } |
| 168 | + |
144 | 169 | } |
0 commit comments