Skip to content

Commit

Permalink
Prepare to release v5.3.2. (sofastack#66)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ujjboy
ujjboy authored Apr 27, 2018
1 parent eb682bb commit f8d1a0d
Show file tree
Hide file tree
Showing 34 changed files with 47 additions and 49 deletions.
2 changes: 1 addition & 1 deletion all/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-all</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>

<name>${project.groupId}:${project.artifactId}</name>
<url>http://github.com/alipay/sofa-rpc</url>
Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-bom</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<packaging>pom</packaging>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion core-impl/client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-core-impl</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core-impl/codec/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-core-impl</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-codec</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core-impl/filter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-core-impl</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-filter</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core-impl/log/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-core-impl</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-log</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core-impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-parent</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-core-impl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core-impl/proxy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-core-impl</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-proxy</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core-impl/transport/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>sofa-rpc-core-impl</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-transport</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-core</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-api</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions core/api/src/main/java/com/alipay/sofa/rpc/common/Version.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ public final class Version {
/**
* 当前RPC版本，例如：5.6.7
*/
public static final String VERSION = "5.3.1";
public static final String VERSION = "5.3.2";

/**
* 当前RPC版本，例如： 5.6.7 对应 50607
*/
public static final int RPC_VERSION = 50301;
public static final int RPC_VERSION = 50302;

/**
* 当前Build版本，每次发布修改
*/
public static final String BUILD_VERSION = "5.3.1_20180419005237";
public static final String BUILD_VERSION = "5.3.2_20180427180628";
}
2 changes: 1 addition & 1 deletion core/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-core</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/exception/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-core</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-exception</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-parent</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-parent</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-example</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extension-impl/api-compatible/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-extension-impl</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-api-compatible</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extension-impl/bootstrap-bolt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-extension-impl</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-bootstrap-bolt</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extension-impl/bootstrap-dubbo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>sofa-rpc-extension-impl</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-bootstrap-dubbo</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extension-impl/bootstrap-rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>sofa-rpc-extension-impl</artifactId>
<groupId>com.alipay.sofa</groupId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-bootstrap-rest</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extension-impl/extension-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-extension-impl</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-extension-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extension-impl/fault-tolerance/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-extension-impl</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-fault-tolerance</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extension-impl/log-common-tools/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-extension-impl</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-log-common-tools</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extension-impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-parent</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-extension-impl</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extension-impl/registry-local/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-extension-impl</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-registry-local</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extension-impl/registry-zk/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-extension-impl</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-registry-zk</artifactId>
Expand Down
22 changes: 9 additions & 13 deletions ...egistry-zk/src/test/java/com/alipay/sofa/rpc/registry/zk/ZookeeperRegistryHelperTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public void testWarmup() throws UnsupportedEncodingException, InterruptedExcepti
.setWeight(200)
.setStaticAttr(ProviderInfoAttrs.ATTR_WEIGHT, "200")
.setStaticAttr(ProviderInfoAttrs.ATTR_START_TIME, String.valueOf(now))
.setStaticAttr(ProviderInfoAttrs.ATTR_WARMUP_TIME, String.valueOf(80))
.setStaticAttr(ProviderInfoAttrs.ATTR_WARMUP_TIME, String.valueOf(200))
.setStaticAttr(ProviderInfoAttrs.ATTR_WARMUP_WEIGHT, String.valueOf(700));

ZookeeperRegistryHelper.processWarmUpWeight(providerInfo);
Expand All @@ -50,12 +50,18 @@ public void testWarmup() throws UnsupportedEncodingException, InterruptedExcepti
Assert.assertEquals(null, providerInfo.getStaticAttr(ProviderInfoAttrs.ATTR_WARMUP_TIME));
Assert.assertEquals(null, providerInfo.getStaticAttr(ProviderInfoAttrs.ATTR_WARMUP_WEIGHT));

Assert.assertEquals(now + 80, providerInfo.getDynamicAttr(ProviderInfoAttrs.ATTR_WARM_UP_END_TIME));
Assert.assertEquals(now + 200, providerInfo.getDynamicAttr(ProviderInfoAttrs.ATTR_WARM_UP_END_TIME));
Assert.assertEquals(700, providerInfo.getDynamicAttr(ProviderInfoAttrs.ATTR_WARMUP_WEIGHT));
Assert.assertEquals(ProviderStatus.WARMING_UP, providerInfo.getStatus());
Assert.assertEquals(700, providerInfo.getWeight());

Thread.sleep(100);
long elapsed = System.currentTimeMillis() - now;
System.out.println("elapsed time: " + elapsed + "ms");

long sleepTime = 300 - elapsed;
if (sleepTime >= 0) {
Thread.sleep(sleepTime);
}

Assert.assertEquals(ProviderStatus.AVAILABLE, providerInfo.getStatus());
Assert.assertEquals(200, providerInfo.getWeight());
Expand All @@ -82,11 +88,6 @@ public void testNoWarmupTime() throws InterruptedException {
Assert.assertEquals(null, providerInfo.getDynamicAttr(ProviderInfoAttrs.ATTR_WARMUP_WEIGHT));
Assert.assertEquals(ProviderStatus.AVAILABLE, providerInfo.getStatus());
Assert.assertEquals(300, providerInfo.getWeight());

Thread.sleep(100);

Assert.assertEquals(ProviderStatus.AVAILABLE, providerInfo.getStatus());
Assert.assertEquals(300, providerInfo.getWeight());
}

@Test
Expand All @@ -110,10 +111,5 @@ public void testNoWarmupWeight() throws InterruptedException {
Assert.assertEquals(null, providerInfo.getDynamicAttr(ProviderInfoAttrs.ATTR_WARMUP_WEIGHT));
Assert.assertEquals(ProviderStatus.AVAILABLE, providerInfo.getStatus());
Assert.assertEquals(600, providerInfo.getWeight());

Thread.sleep(100);

Assert.assertEquals(ProviderStatus.AVAILABLE, providerInfo.getStatus());
Assert.assertEquals(600, providerInfo.getWeight());
}
}
2 changes: 1 addition & 1 deletion extension-impl/remoting-bolt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-extension-impl</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-remoting-bolt</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extension-impl/remoting-resteasy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-extension-impl</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-remoting-resteasy</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-parent</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
<packaging>pom</packaging>
<name>[SOFA] - RPC Framework</name>
<url>http://www.antfin.com</url>
Expand Down
2 changes: 1 addition & 1 deletion test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-parent</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-test</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/test-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-test</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-test-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion test/test-integration-3rd/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-test</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-test-integration-3rd</artifactId>
Expand Down
6 changes: 4 additions & 2 deletions test/test-integration-3rd/src/test/java/com/alipay/sofa/rpc/registry/zk/WarmUpTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,10 @@ public void testWarmUp() throws InterruptedException {

long elapsed = System.currentTimeMillis() - startTime;
System.out.println("elapsed " + elapsed + "ms");
if (elapsed > 0) {
Thread.sleep(2050 - elapsed);

long sleepTime = 2100 - elapsed;
if (sleepTime >= 0) {
Thread.sleep(sleepTime);
}

// After 2000 ms, all the traffic goes to 22222 && 22111.
Expand Down
2 changes: 1 addition & 1 deletion test/test-integration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-rpc-test</artifactId>
<version>5.3.1</version>
<version>5.3.2</version>
</parent>

<artifactId>sofa-rpc-test-integration</artifactId>
Expand Down

0 comments on commit f8d1a0d

Please sign in to comment.