Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix checksum bug #2401 #2403

Merged
merged 4 commits into from
Mar 29, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions naming/src/main/java/com/alibaba/nacos/naming/core/Instances.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,17 @@
*/
public class Instances implements Record {

private static MessageDigest MESSAGE_DIGEST;

static {
try {
MESSAGE_DIGEST = MessageDigest.getInstance("MD5");
} catch (NoSuchAlgorithmException e) {
Loggers.SRV_LOG.error("error while calculating checksum(md5) for instances", e);
MESSAGE_DIGEST = null;
private static ThreadLocal<MessageDigest> MESSAGE_DIGEST_LOCAL = new ThreadLocal<MessageDigest>() {
@Override
protected MessageDigest initialValue() {
try {
return MessageDigest.getInstance("MD5");
} catch (NoSuchAlgorithmException e) {
Loggers.SRV_LOG.error("error while calculating checksum(md5) for instances", e);
return null;
}
}
}
};

private List<Instance> instanceList = new ArrayList<>();

Expand Down Expand Up @@ -83,9 +84,10 @@ private String recalculateChecksum() {
sb.append(",");
}

if (MESSAGE_DIGEST != null) {
checksum =
new BigInteger(1, MESSAGE_DIGEST.digest((sb.toString()).getBytes(Charset.forName("UTF-8")))).toString(16);
if (MESSAGE_DIGEST_LOCAL.get() != null) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here, you can consider holding the MessageDigest with a local variable to avoid getting again later

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here, you can consider holding the MessageDigest with a local variable to avoid getting again later

done

checksum = new BigInteger(1,
MESSAGE_DIGEST_LOCAL.get().digest((sb.toString()).getBytes(Charset.forName("UTF-8"))))
.toString(16);
} else {
checksum = RandomStringUtils.randomAscii(32);
}
Expand Down
112 changes: 112 additions & 0 deletions naming/src/test/java/com/alibaba/nacos/naming/core/InstancesTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
/*
* Copyright 1999-2018 Alibaba Group Holding Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.nacos.naming.core;

import org.junit.Test;

import java.math.BigInteger;
import java.nio.charset.Charset;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;

/**
* @author lkxiaolou
*/
public class InstancesTest {

private static MessageDigest MESSAGE_DIGEST;

static {
try {
MESSAGE_DIGEST = MessageDigest.getInstance("MD5");
} catch (NoSuchAlgorithmException e) {
MESSAGE_DIGEST = null;
}
}

private static ThreadLocal<MessageDigest> MESSAGE_DIGEST_LOCAL = new ThreadLocal<MessageDigest>() {
@Override
protected MessageDigest initialValue() {
try {
return MessageDigest.getInstance("MD5");
} catch (NoSuchAlgorithmException e) {
return null;
}
}
};

@Test
public void checkSumNotThreadSafe() throws Exception {

final AtomicBoolean catchException = new AtomicBoolean(false);
CountDownLatch countDownLatch = new CountDownLatch(4);

for (int i = 0; i < 4; i++) {
Thread thread = new Thread(new Runnable() {
@Override
public void run() {
while (true) {
if (catchException.get()) {
break;
}
try {
checkSumThreadNotSafeVersion("test");
} catch (ArrayIndexOutOfBoundsException e) {
catchException.set(true);
}
}
countDownLatch.countDown();
}
});
thread.start();
}

countDownLatch.await();

assert catchException.get();
}

//@Test
// 跑起来比较久,所以注释掉
public void checkSumThreadSafe() throws Exception {

CountDownLatch countDownLatch = new CountDownLatch(4);

for (int i = 0; i < 4; i++) {
Thread thread = new Thread(new Runnable() {
@Override
public void run() {
for (int j = 0; j < Integer.MAX_VALUE; j++) {
checkSumThreadSafeVersion("test");
}
countDownLatch.countDown();
}
});
thread.start();
}
countDownLatch.await();
}

private String checkSumThreadNotSafeVersion(String checkString) {
return new BigInteger(1, MESSAGE_DIGEST.digest((checkString).getBytes(Charset.forName("UTF-8")))).toString(16);
}

private String checkSumThreadSafeVersion(String checkString) {
return new BigInteger(1, MESSAGE_DIGEST_LOCAL.get().digest((checkString).getBytes(Charset.forName("UTF-8")))).toString(16);
}
}