Close #8417

What is the purpose of the change

Brief changelog

XX

Verifying this change

XXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

• Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
• Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
• Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
• Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
• Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

Contact Details

No response

What happened?

A bug happened! 运行环境: 固件版本:

Version

master (Default)

What soultions are you seeing the problem on?

No response

Relevant log output

No response

Which Component Nacos Discovery

Version

<dependency>
	<groupId>com.alibaba.cloud</groupId>
	<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
	<version>2021.0.1.0</version>
</dependency>

Describe the bug When I run my application and register my service instance with the config spring.cloud.nacos.discovery.ephemeral=false, by which indicates that it's a permanent service. But when I shutdown the application gracefully, the console shows that it deregisters the instance: 2022-03-28 14:22:04.197 INFO 19248 --- [ionShutdownHook] c.a.c.n.registry.NacosServiceRegistry : De-registering from Nacos Server now... 2022-03-28 14:22:04.216 INFO 19248 --- [ionShutdownHook] c.a.c.n.registry.NacosServiceRegistry : De-registration finished.

Yet it turns out doesn't deregister the instance.

I've checked the deregister code:

com.alibaba.cloud.nacos.registry.NacosServiceRegistry#deregister(Registration registration)
	@Override
	public void deregister(Registration registration) {

		...

		NamingService namingService = namingService();
		String serviceId = registration.getServiceId();
		String group = nacosDiscoveryProperties.getGroup();

		try {
			namingService.deregisterInstance(serviceId, group, registration.getHost(),
					registration.getPort(), nacosDiscoveryProperties.getClusterName());
		}
		catch (Exception e) {
			...
		}

		...
	}

com.alibaba.nacos.client.naming.NacosNamingService#deregisterInstance(String serviceName, String groupName, String ip, int port, String clusterName)
    @Override
    public void deregisterInstance(String serviceName, String groupName, String ip, int port, String clusterName)
            throws NacosException {
        Instance instance = new Instance();
        instance.setIp(ip);
        instance.setPort(port);
        instance.setClusterName(clusterName);
        
        deregisterInstance(serviceName, groupName, instance);
    }

When the application shutdown gracefully, it triggers the deregister instance event. But it doesn't pass the ephemeral param to the deregisterInstance function, and the ephemeral field in com.alibaba.nacos.api.naming.pojo.Instance defaults as true, which causes the bug.

Please do not create a Pull Request without creating an issue first.

What is the purpose of the change

XXXXX

Brief changelog

XX

Verifying this change

XXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

• Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
• Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
• Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
• Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
• Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

Please do not create a Pull Request without creating an issue first.

What is the purpose of the change

• Close #8407
• Fix circular dependency
• Fix failed UT

Brief changelog

XX

Verifying this change

XXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

• Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
• Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
• Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
• Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
• Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

Removing unwanted colons.

Please do not create a Pull Request without creating an issue first.

What is the purpose of the change

XXXXX

Brief changelog

XX

Verifying this change

XXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

• Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
• Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
• Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
• Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
• Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

tidevice version: 0.7.13 iOS: 14.7

15:27:17 Traceback (most recent call last):
15:27:17   File "/usr/local/Cellar/[email protected]/3.9.7/Frameworks/Python.framework/Versions/3.9/lib/python3.9/runpy.py", line 197, in _run_module_as_main
15:27:17     return _run_code(code, main_globals, None,
15:27:17   File "/usr/local/Cellar/[email protected]/3.9.7/Frameworks/Python.framework/Versions/3.9/lib/python3.9/runpy.py", line 87, in _run_code
15:27:17     exec(code, run_globals)
15:27:17   File "/usr/local/lib/python3.9/site-packages/tidevice/__main__.py", line 871, in <module>
15:27:17     main()
15:27:17   File "/usr/local/lib/python3.9/site-packages/tidevice/__main__.py", line 866, in main
15:27:17     actions[args.subparser](args)
15:27:17   File "/usr/local/lib/python3.9/site-packages/tidevice/__main__.py", line 259, in cmd_xctest
15:27:17     d.xctest(args.bundle_id,
15:27:17   File "/usr/local/lib/python3.9/site-packages/tidevice/_device.py", line 970, in xctest
15:27:17     return self.xcuitest(bundle_id, target_bundle_id=target_bundle_id, logger=logger, env=env)
15:27:17   File "/usr/local/lib/python3.9/site-packages/tidevice/_device.py", line 1057, in xcuitest
15:27:17     _, pid = self._launch_app_runner(bundle_id, session_identifier,
15:27:17   File "/usr/local/lib/python3.9/site-packages/tidevice/_device.py", line 847, in _launch_app_runner
15:27:17     conn = self.connect_instruments()
15:27:17   File "/usr/local/lib/python3.9/site-packages/tidevice/_device.py", line 800, in connect_instruments
15:27:17     conn = self.start_service(
15:27:17   File "/usr/local/lib/python3.9/site-packages/tidevice/_device.py", line 492, in start_service
15:27:17     return self._unsafe_start_service(name)
15:27:17   File "/usr/local/lib/python3.9/site-packages/tidevice/_device.py", line 528, in _unsafe_start_service
15:27:17     conn = self.create_inner_connection(data['Port'], _ssl=_ssl, ssl_dial_only=ssl_dial_only)
15:27:17   File "/usr/local/lib/python3.9/site-packages/tidevice/_device.py", line 306, in create_inner_connection
15:27:17     conn.switch_to_ssl(self.ssl_pemfile_path)
15:27:17   File "/usr/local/lib/python3.9/site-packages/tidevice/_safe_socket.py", line 132, in switch_to_ssl
15:27:17     ssock = context.wrap_socket(self._sock, server_hostname="iphone.localhost")
15:27:17   File "/usr/local/Cellar/[email protected]/3.9.7/Frameworks/Python.framework/Versions/3.9/lib/python3.9/ssl.py", line 500, in wrap_socket
15:27:17     return self.sslsocket_class._create(
15:27:17   File "/usr/local/Cellar/[email protected]/3.9.7/Frameworks/Python.framework/Versions/3.9/lib/python3.9/ssl.py", line 1040, in _create
15:27:17     self.do_handshake()
15:27:17   File "/usr/local/Cellar/[email protected]/3.9.7/Frameworks/Python.framework/Versions/3.9/lib/python3.9/ssl.py", line 1309, in do_handshake
15:27:17     self._sslobj.do_handshake()
15:27:17 socket.timeout: _ssl.c:1112: The handshake operation timed out

Wrap the export process with End2endModelExportWrapper. We support the export version of 'jit' and 'blade'.

One can choose whether to end2end export a model with a little bit more time cost.

For more details of blade, you can refer to https://help.aliyun.com/document_detail/205134.html

1. By exporting an end2end model, we speed up yoloxs from 54fps to 160fps on 1080Ti.

2. By wrapping only the forward process, we speed up yoloxs from 53fps to 174fps on 1080Ti.

Wrap the export process with End2endModelExportWrapper. We support the export version of 'jit' and 'blade'.

One can choose whether to end2end export a model with a little bit more time cost.

For more details of blade, you can refer to https://help.aliyun.com/document_detail/205134.html

1. By exporting an end2end model, we speed up yoloxs from 54fps to 160fps on 1080Ti.

2. By wrapping only the forward process, we speed up yoloxs from 53fps to 174fps on 1080Ti.

Wrap the export process with End2endModelExportWrapper. We support the export version of 'jit' and 'blade'.

One can choose whether to end2end export a model with a little bit more time cost.

For more details of blade, you can refer to https://help.aliyun.com/document_detail/205134.html

1. By exporting an end2end model, we speed up yoloxs from 54fps to 160fps on 1080Ti.

2. By wrapping only the forward process, we speed up yoloxs from 53fps to 174fps on 1080Ti.