Commit Graph

2828 Commits

Author SHA1 Message Date
chuntaojun
3c8b84166c refactor: merge upstream jraft-naming 2020-10-11 22:11:47 +08:00
chuntaojun
4987276eda fix: fix merge conflict 2020-09-30 17:14:57 +08:00
chuntaojun
8ad399a4aa feat: merge upstream develop 2020-09-30 17:00:39 +08:00
chuntaojun
c442a71a5f Merge branch 'jraft-naming' of https://github.com/KomachiSion/nacos into jraft_naming 2020-09-30 14:24:27 +08:00
赵延
f6c6a9f3b2
[ISSUE #3850] ignore socket exception when client destroy already (#3906)
* if client destroy already, ignore socket exception.

* remove the exception's judgement

* remove unuseful import
2020-09-30 13:14:42 +08:00
chuntaojun
a6a09d221f refactor: merge xiwen branch 2020-09-30 01:17:02 +08:00
KomachiSion
ea515428ce Fix 1.3.2 upgrade 1.4.0 can't notify service change problem 2020-09-25 18:55:57 +08:00
KomachiSion
402ad12c85 Move datum key check to KeyBuilder 2020-09-25 15:17:12 +08:00
KomachiSion
481a1f972f Revert PR#2849. 2020-09-25 15:06:21 +08:00
KomachiSion
170f979d44 Use multiple kv storage in new raft processor to compatible old data 2020-09-25 13:58:19 +08:00
KomachiSion
eceab55cef Use datum in new raft processor to compatible old data 2020-09-24 17:03:24 +08:00
chuntaojun
bb4bc3c457 Merge branch 'jraft-naming' of https://github.com/KomachiSion/nacos into jraft_naming 2020-09-23 20:41:16 +08:00
KomachiSion
f792300da2 Fix Performance logger thread call old raft error 2020-09-23 20:29:35 +08:00
KomachiSion
63dafba085 Fix Listener do not listen new consistency problem 2020-09-23 20:28:26 +08:00
sanxun0325
787ea47cfe
[ISSUE #3781]Fix service list intermittently lost service (#3891)
* update service init

* commit futureMap.remove()

* update serviceManager

Co-authored-by: yanlinly <yan.lin2009@163.com>
Co-authored-by: 杨翊 SionYang <263976490@qq.com>
2020-09-23 20:17:07 +08:00
sanxun0325
e2c037dd48
update spring boot dependencies version (#3900)
Co-authored-by: yanlinly <yan.lin2009@163.com>
Co-authored-by: 杨翊 SionYang <263976490@qq.com>
2020-09-23 20:15:15 +08:00
KomachiSion
825fe6c470 Temp fix raft server can't refresh raft configuration problem 2020-09-23 13:59:07 +08:00
chuntaojun
0da7224d1a Merge branch 'jraft-naming' of https://github.com/KomachiSion/nacos into jraft_naming 2020-09-22 20:49:30 +08:00
chuntaojun
11873f925d feat: merge from xiwen 2020-09-22 20:49:25 +08:00
ljhrot
7902b22e05
Fix chinese string are truncated in ConcunrrentDiskUtil (#3883) 2020-09-22 20:42:13 +08:00
KomachiSion
3592846ad9 Fix jraft problem 2020-09-22 20:39:46 +08:00
shizhengxing
5df146e26b
[ISSUE #3871] fix description don't match the error (#3886) 2020-09-22 15:55:46 +08:00
chuntaojun
acb6b1f40c Merge branch 'jraft_naming' of https://github.com/chuntaojun/nacos into jraft_naming 2020-09-22 13:15:22 +08:00
赵延
f01cd59bf7
[ISSUE #3867] replace the way which get version (#3872)
* replace the way which get version

* remove version sign application.properties in nacos-api
2020-09-21 19:11:21 +08:00
mai.jh
4ce897e409
bug: fix the problem of incorrect judgment of http response code in SubscribeManager#getSubscribers() method (#3879) 2020-09-21 15:18:23 +08:00
liaochuntao
7fd4d9a5d1
feature issue #3804 (#3805)
* improvement: merge upstream/develop

* feat: merge upstream develop

* feat: manage the loading of configuration files uniformly

* fix: fix copyright style

* style: fix code style

* fix: fix code style
2020-09-18 16:05:36 +08:00
mai.jh
473090ba13
Fix http client contentType charset problem (#3848) 2020-09-17 17:49:11 +08:00
KomachiSion
fdee6b8b69 For checkstyle and pmd 2020-09-16 16:51:44 +08:00
杨翊 SionYang
700c90d15f
Fix code style problem in DiskUtils (#3842) 2020-09-16 12:33:33 +08:00
杨翊 SionYang
2ded5a24fc
Set mediaType charset as utf8 (#3837) 2020-09-16 09:14:03 +08:00
杨翊 SionYang
565557c5c5
Fix NullPointerException when no subscriber for slow event (#3835) 2020-09-15 14:50:57 +08:00
mai.jh
5e4429f0e4
[ISSUE#3192] naming module replace http client (#3763)
* naming module replace http client

* refactor: naming module replace http client.

* refactor: naming module replace http client.

* refactor: Add apache http client Factory.

* refactor: naming module replace http client.

* fix code style

* refactor: Add http client config

* refactor: naming module HttpClientManager change

* refactor: naming module HttpClientManager change

* refactor: naming module replace http client.

* fix code style

* refactor: fix JDK http client Use error problem.

* refactor: Query And Header entity init Add non-empty judgment

* Enhance the asynchronous http delete request method to support body passing parameters.

* refactor: apache http client set MaxConnTotal and maxConnPerRoute.
2020-09-15 09:18:20 +08:00
liaochuntao
7101b6b020
Jraft naming (#3826)
* fix-#3595, delete the unnecessary code (#3596)

* [ISSUE #3566] move the permission code of nacos-core module to nacos-auth module (#3593)

* move the permission code of nacos-core module to nacos-auth module.

* Fix some code style issues

* address server module auth package name change.

* test change

* Incorrect package name correction

* [ISSUE #3592] Fix incorrect prompt when accessing the restricted namespace (#3603)

* Fix incorrect prompt when accessing the restricted namespace

* Modify variable name

* [ISSUE #3600] Replace the deprecated api of jwt (#3616)

* replace the deprecated api of jwt

* transfer secretKey to byte array just using String encode with utf-8

* [ISSUE #3613]  Fix `unit test method not be static` & update publish config listener  in `ConfigTest.java` (#3614)

* fix `unit test method not be static` & update publish config listener in `ConfigTest.java`

* fix `unit test method not be static` & update publish config listener in `ConfigTest.java`

* move jwt dependency from console,core to auth. (#3624)

* refactor: unified implementation of http client api adjustment. (#3639)

* [ISSUE #3628] set naming client updateTask interval more flexible (#3637)

* 1.use server cacheMillis event service deleted
2.naming client UpdateTask's interval will inc by failCount that connect with server

* 1.move failCount to updateTask
2.redefine the updateService method name. updateServiceNow -> updateService, wrap updateService in updateServiceNow when first getServiceInfo

* 1.create push client even service is not exist
2.serviceInfo's hosts is empty or can't connect to server both add the updateTsk interval

* format the indent

* fix: create kvstorage

* refactor: create kv storage]

* refactor: refactor rocksdb storage code

* Fix issue 3661 (#3662)

* improvement: merge upstream/develop

* feat: merge upstream develop

* fix: fix issue #3661

* [ISSUE#3658] refactor TaskManager and move to nacos-common module (#3663)

* Add TaskManagerTest

* Move Abstract Task and Task processor to nacos-common

* Add Nacos execute engine interface and nacos task interface

* Refactor Task Manager to NacosDelayTaskExecuteEngine

* for code style

* [ISSUE #3671] move some tools class into common package (#3672)

* for #3621 (#3668)

* [ISSUE#3315]Nacos client support https (#3654)

* [ISSUE #3315] nacos client support https
* common module add tls related classes
* JdkHttpClientRequest support https
* unified IpUtils

* [ISSUE #3315] nacos client support https
* common module add tls related classes
* JdkHttpClientRequest support https
* unified IpUtils

* [ISSUE #3315] nacos client support https

* format code

* fix typo and doc format of README file (#3688)

1. It’s a little weird to use Chinese comma in English
2. Fix typo:   change 'reposity' to  'repository', 'instance' to 'instances'
3. Format other details of the doc

* Try to fix nacos server CLOSE_WAIT (#3703)

* Fix revert chunk isn't work in Content Comparison page (#3686)

* fix: fixed cluster node version issue

* Fix Logging in with the wrong username or password will cause jackson serialization results to fail (#3695) (#3721)

* [ISSUE#3712] add apache http client factory (#3716)

* refactor: Add apache http client Factory.

* refactor: Add apache http client Factory.

* add license

* refactor: class name change

* [Issue#3692] Use new distro task engine replace old task dispatcher. (#3715)

* Add ServiceManagerTest

* Add DistroConsistencyServiceImplTest

* Add new distro entities

* Add new distro sync data change

* add new VerifyTask to do checksum.

* Replace old sync task and checksum task

* Add retry sync change task.

* Fix high cpu load

* For checkstyle

* Combine naming sync task to reduce http cost

* Move some classes

* Refactor keys combined logic

* enhance package construct

* Fix unit test

* For pmd

* [Issue #3692] Use new distro implmentation to handle sync datum and checksum request (#3734)

* Add receive data and verify data distro protocol interface

* Use new distro implmentation to handle sync datum and checksum request

* Use new distro implmentation to handle get datum request.

* refactor: adjust the data loading logic when a new protocol is started

* [ISSUE#3692] Use new distro implmentation to handle init all datum request. (#3744)

* Add load data task in DistroProtocol

* Use new distro implmentation to handle init all datum request.

* Fix unit test

* fix: #3617 (#3678)

* fix #3617

* 调整代码格式

* 修改抛出的Exception类型

* 调整逻辑

* 移除没用到的方法

* 修改注释

* [ISSUE#3658] Move distro sync code to nacos-core module (#3750)

* Move distro sync code to nacos-core module

* Update unit test

* feat: none

* fix: fixing serialization problems

* fix: fixed some logic errors

Co-authored-by: 赵延 <1060026287@qq.com>
Co-authored-by: mai.jh <maijh97@gmail.com>
Co-authored-by: ljhrot <296093710@qq.com>
Co-authored-by: Xarrow <zhangjian12424@gmail.com>
Co-authored-by: 杨翊 SionYang <263976490@qq.com>
Co-authored-by: Gagharv <wwfortunate@gmail.com>
Co-authored-by: syapollo <34880947+syapollo@users.noreply.github.com>
Co-authored-by: S2W <joexsue@foxmail.com>
Co-authored-by: Tboy <technotboy@yeah.net>
Co-authored-by: 邪影oO <213539@qq.com>
2020-09-14 22:31:55 +08:00
chuntaojun
4e8936b8a7 fix: fix conflict 2020-09-14 22:30:22 +08:00
chuntaojun
bb3e1dda61 fix: fixed some logic errors 2020-09-14 22:24:01 +08:00
杨翊 SionYang
dc5cba2e69
Merge pull request #3816 from mark4z/develop
[ISSUE#3787]  fix ConvertUtils can not handle FormatException.
2020-09-14 14:55:22 +08:00
Marcus
af2151e49c fix ConvertUtils can not handle FormatException. 2020-09-14 11:56:12 +08:00
Mark4z
0c8bdfd82f
Merge pull request #1 from alibaba/develop
T
2020-09-13 23:39:53 +08:00
S2W
a41d209d57
Update ConvertUtils.java (#3789) 2020-09-09 17:03:25 +08:00
mai.jh
baa699a3f1
[ISSUE#3790] Supplement http response Content-Encoding processing. (#3791)
* bug: fix issue #3790, Supplement http response Content-Encoding processing

* bug: fix issue #3790, Supplement http response Content-Encoding processing.

* bug: fix issue #3790, Supplement http response Content-Encoding processing.
2020-09-09 17:01:18 +08:00
赵延
3dc0f243f8
[ISSUE #3687] check serviceName's format(groupName@@serviceName) in server and client (#3767)
* 1.in server, check serviceName's format 'groupName@@serviceName', groupName and serviceName can't be blank
2.in client, check 'groupName@@serviceName', groupName and serviceName can't be blank

* ignore the check to groupName

* check split's length instead of exception to check argument

* 1.add some notes
2.remove unnecessary code

* modify the notes
2020-09-09 16:40:07 +08:00
杨翊 SionYang
f42cb4716d
[ISSUE #3658] Some enhance refactor for naming distro (#3765)
* Some enhance refactor for naming distro

* Remove null code
2020-09-08 11:30:19 +08:00
yanlinly
f423d39d10
Revert "[#3368]Cancel empty Long polling thread to improve performance. (#ISSUE3432)" (#3778)
This reverts commit 95c8bf242b.
2020-09-08 10:00:46 +08:00
杨翊 SionYang
d84d1a86cc
Merge pull request #3772 from horizonzy/fix-3770
[ISSUE #3770] replace the deprecated api com.fasterxml.jackson.databind.node.ObjectNode#put(java.lang.String, com.fasterxml.jackson.databind.JsonNode)
2020-09-07 16:34:40 +08:00
horizonzy
1f8a64b11d replace the deprecated api com.fasterxml.jackson.databind.node.ObjectNode#put(java.lang.String, com.fasterxml.jackson.databind.JsonNode) 2020-09-07 15:15:47 +08:00
chuntaojun
f2adaffc9d fix: fixing serialization problems 2020-09-04 02:02:57 +08:00
chuntaojun
304ebe94e1 feat: none 2020-09-04 01:13:16 +08:00
chuntaojun
acbd5bfa36 feat: merge upstream develop 2020-09-04 01:12:51 +08:00
杨翊 SionYang
37bb909785
[ISSUE#3658] Move distro sync code to nacos-core module (#3750)
* Move distro sync code to nacos-core module

* Update unit test
2020-09-04 00:15:11 +08:00
邪影oO
043a504a33
fix: #3617 (#3678)
* fix #3617

* 调整代码格式

* 修改抛出的Exception类型

* 调整逻辑

* 移除没用到的方法

* 修改注释
2020-09-03 21:14:23 +08:00