Skip to content
Open
Changes from 1 commit
Commits
Show all changes
336 commits
Select commit Hold shift + click to select a range
1788ac2
<feature>[config]: implement GuestOsHelper
AlanJager May 14, 2024
95cda01
<refactor>[kvm]: use GuestOsHelper instead of local variables
AlanJager May 14, 2024
c106a26
Merge branch 'ZSTAC-65384@@2' into '5.1.8'
May 31, 2024
d71d15c
<feature>[config]: introduce guest os metadata apis
AlanJager May 14, 2024
db39b7f
<feature>[sdk]: update sdk
AlanJager May 14, 2024
0a1af98
<fix>[conf]: aliyun endpoint SystemTag
May 31, 2024
08f184f
<test>[config]: test guest os metadata apis
AlanJager May 14, 2024
5fa322a
<fix>[crypto]: resolve failure in image encryption integrity
liang-hanyu May 31, 2024
3dc4b19
Merge branch 'ZSTAC-65654@@2' into '5.1.8'
May 31, 2024
4ddd32b
<fix>[Kvm]: fix guest os extension typo
AlanJager Jun 3, 2024
c38b5c7
Merge branch 'ZSTAC-66400' into '5.1.8'
Jun 3, 2024
f25de0d
Merge branch 'fix_66383' into '5.1.8'
Jun 3, 2024
0f85b2a
<fix>[conf]: i18n_cn translate
Jun 3, 2024
2ba625d
Merge branch 'fix-65664' into '5.1.8'
Jun 3, 2024
b1e2e9a
<fix>[expon]: decode url if complex password
MaJin1996 Jun 3, 2024
7acef25
<fix>[core]: resolve inability to select login identity after MN upgrade
liang-hanyu Jun 3, 2024
7f4f97c
<fix>[network]: add error cause <description>
ruansteve Jun 4, 2024
d75e2b9
<fix>[dnsmasq]: re deploy if dnsmasq file lost
Apr 18, 2024
7fa3187
Merge branch 'fix-65330' into '5.1.8'
Jun 4, 2024
9efb9ef
Merge branch 'support-complex-pswd' into '5.1.8'
MaJin1996 Jun 4, 2024
e22848b
Merge branch 'shixin-ZSTAC-66347' into '5.1.8'
Jun 4, 2024
3320108
Merge branch 'fix_66373' into '5.1.8'
Jun 4, 2024
bd3eb78
<fix>[vm]: clone vm with ip address & dhcp enable/disable
ruansteve Apr 25, 2024
15a040d
Merge branch 'shixin-ZSTAC-65098' into '5.1.8'
Jun 4, 2024
4f6ee52
Merge branch 'shixin-ZSTAC-65712@@3' into '5.1.8'
Jun 4, 2024
979a319
<fix>[fiberchannel]: support refresh FC on a single cluster
Jun 5, 2024
b8747a5
<fix>[conf]: add i18n
Jun 5, 2024
38f6c3c
<fix>[sns]: emay sms i18n
Jun 5, 2024
ffda3e5
Merge branch 'fix_66459' into '5.1.8'
Jun 5, 2024
2b42d4d
Merge branch 'fix_66373' into '5.1.8'
Jun 5, 2024
ed3e24d
<fix>[compute]: fix changeVmNicStateMsg with same state
bustezero Jun 5, 2024
d0065a6
<fix>[vm]: disable dhcp will disable ipam
ruansteve Jun 5, 2024
f358126
<fix>[mevoco]: add attachVipToVpcSharedQos param
bustezero Jun 5, 2024
465383f
Merge branch 'shixin-ZSTAC-66506@@2' into '5.1.8'
Jun 5, 2024
d91adf3
Merge branch 'fix-65127' into '5.1.8'
Jun 5, 2024
04f6542
<fix>[conf]: resolve time field errors in IAM2AttributeAO subclasses
liang-hanyu Jun 5, 2024
ec66f83
Merge branch 'fix-65309@@2' into '5.1.8'
Jun 6, 2024
c6181ab
Merge branch 'fix-66109@@2' into '5.1.8'
Jun 6, 2024
f937bf1
<fix>[virtualRouterProvider]: diable vpc network ipam
ruansteve Jun 5, 2024
035d259
Merge branch 'shixin-ZSTAC-66511@@2' into '5.1.8'
ruansteve Jun 12, 2024
b97fec3
<test>[dhcp]: refresh dhcp config when enable dhcp service
ruansteve Jun 12, 2024
0fba022
Merge branch 'shixin-ZSTAC-66677' into '5.1.8'
ruansteve Jun 13, 2024
8206d72
<fix>[mevoco]: add rev info at pciDevice TO and VO
bustezero Jun 12, 2024
ac39c5d
Merge branch 'fix-66062@@2' into '5.1.8'
Jun 13, 2024
8ba6f98
Merge branch 'add-clusterUuid-on-RefreshFC@@2' into '5.1.8'
Jun 13, 2024
3e5f1ac
<fix>[compute]: set static ip with netmask & gateway if dhcp is disabled
ruansteve Jun 13, 2024
12bf8bc
Merge branch 'shxin-ZSTAC-66748@@2' into '5.1.8'
ruansteve Jun 14, 2024
813eb40
<fix>[network]: check ip address if there is no ip range
ruansteve Jun 14, 2024
4295eda
Merge branch 'shixin-ZSTAC-66619@@2' into '5.1.8'
ruansteve Jun 15, 2024
dc4dd1a
<fix>[conf]: reset sharedblock qcow2 allocation
Jun 12, 2024
6d0ca59
<fix>[virtualRouterProvider]: lb candiate filter out nic without ip …
ruansteve Jun 17, 2024
7cb430e
Merge branch 'shixin-ZSTAC-66820@@2' into '5.1.8'
ruansteve Jun 18, 2024
0f48e61
<fix>[compute]: fix SugonSdnControllerCase error
bustezero Jun 17, 2024
8f6b809
Merge branch 'fix-66748' into '5.1.8'
ruansteve Jun 18, 2024
a505315
<fix>[log]: dynamic load custom log configuration
Jun 14, 2024
f101a0d
Merge branch 'fix_65832_log_configuration_sync_task@@2' into '5.1.8'
Jun 18, 2024
26c8ed0
<fix>[storage]: support delete qos on expon
PandaWuu Jun 13, 2024
0fb3728
<fix>[network]: ignore vmnic without iprange when apply dhcp<descript…
ruansteve Jun 18, 2024
15135e7
Merge branch 'shixin-ZSTAC-66889@@2' into '5.1.8'
ruansteve Jun 18, 2024
a7c8c69
Merge branch 'set-sblk-alloc-conf' into '5.1.8'
Jun 19, 2024
6e809c0
<fix>[kvm]: add physical nic alarm filter
bustezero Jun 18, 2024
447555f
<fix>[kvm]: QEMU 64-bit PCI MMIO Setup
ZqyDaoDao Jun 19, 2024
d7d7e14
Merge branch 'vhost@@2' into '5.1.8'
Jun 19, 2024
717c84d
Merge branch 'fix-61869@@2' into '5.1.8'
Jun 19, 2024
23d6f32
<fix>[conf]:add GPU monitoring
ZqyDaoDao May 7, 2024
8a2f2da
<feature>[baremetal2]: add PciDeviceVO,GpuDeviceVO for bm2 chassis
May 30, 2024
bee2103
Merge branch 'ZSTAC-64893@@3' into '5.1.8'
Jun 20, 2024
4b7e83c
Merge branch 'GPUinto5.1.8@@3' into '5.1.8'
PandaWuu Jun 20, 2024
d8c5414
<feature>[file]: introduce FileDesc.java
AlanJager Apr 24, 2024
31b965b
<fix>[storage]: add more capacity check for snapshot creation
MaJin1996 Apr 25, 2024
b012f49
<fix>[storage]: fix mark vol as snapshot rollback
MaJin1996 Jun 20, 2024
105a597
Merge branch 'cherry-pick-633b9ce3' into '5.1.8'
MaJin1996 Jun 20, 2024
3697621
<fix>[storage]: add more capacity check for snapshot creation
MaJin1996 Apr 25, 2024
87a67c1
Merge branch 'cherry-pick-3fe99a77-2' into '5.1.8'
MaJin1996 Jun 20, 2024
576bbea
Merge branch 'cherry-pick-3fe99a77' into '5.1.8'
MaJin1996 Jun 20, 2024
244b071
<fix>[conf]: gpu delete when chassis deleted
Jun 21, 2024
d4de6ff
Merge branch 'ZSTAC-65316@@2' into '5.1.8'
Jun 21, 2024
0a20dec
Merge branch 'ZSTAC-67012@@2' into '5.1.8'
PandaWuu Jun 24, 2024
3ea8468
<fix>[kvm]: fix disk alarm
ZqyDaoDao Jun 28, 2024
1aeb741
Merge branch 'ZSTAC-67164@@2' into '5.1.8'
Jun 28, 2024
90dd892
<fix>[flatNetworkProvider]: skip while loop if no vm on the host
ruansteve Jun 29, 2024
398b53d
Merge branch 'shixin-ZSTAC-67192' into '5.1.8'
Jun 29, 2024
7c092bd
<fix>[conf]: Generate GPU data for existing CPU devices
ZqyDaoDao Jul 1, 2024
687d278
Merge branch 'ZSTAC-67193' into '5.1.8'
Jul 1, 2024
0d78fd3
<fix>[host]: fix host hw monitor status
ZqyDaoDao Jul 1, 2024
441ca2d
Merge branch 'ZSTAC-67136@@2' into '5.1.8'
Jul 2, 2024
6e616f8
<fix>[conf]: Fix GPU Upgrade
ZqyDaoDao Jul 2, 2024
108aaa2
Merge branch 'ZSTAC-67236' into '5.1.8'
Jul 2, 2024
86e84a8
<fix>[conf]: Fix GPU Upgrade
ZqyDaoDao Jul 3, 2024
35d8f47
Merge branch '67236' into '5.1.8'
Jul 3, 2024
1b74bcb
bump version to 5.2.0
liang-hanyu Jul 9, 2024
9b5d9af
Merge branch 'bump-version-5.2.0@@3' into '5.2.0'
Jul 11, 2024
64081a8
<fix>[expon]: fix npe on vhost dicovery and request
PandaWuu Jul 11, 2024
f202128
Merge branch '5.1.8' into '5.2.0'
Jul 11, 2024
f490e0b
<fix>[singleflight]: fix login deadlock
PandaWuu Jul 11, 2024
81a2ebf
Merge branch '5.1.8' into '5.2.0'
Jul 11, 2024
cd16173
<fix>[expon]: reload db on construct
PandaWuu Jul 11, 2024
2947f78
Merge branch '5.2.0' into '5.2.0'
Jul 12, 2024
f9207f5
<fix>[expon]: fix npe on primarystorage connect
PandaWuu Jul 12, 2024
4ece8ba
Merge branch '5.2.0' into '5.2.0'
Jul 12, 2024
22e4d29
<fix>[zone]: using regex validate name cloumn
Jul 12, 2024
e3e1b94
Merge branch 'ZSTAC-56291' into '5.2.0'
Jul 15, 2024
7a3d020
<fix>[search]: zql support agg function
Jun 7, 2024
053ccbe
Merge branch 'fix_65080_zql_function@@2' into '5.2.0'
Jul 19, 2024
9c61ff9
<test>[l3network]: fix static ip error
ruansteve Jul 22, 2024
ed5490c
<fix>[conf]: Host can't connection i18n
Jul 23, 2024
043f793
Merge branch 'ZSTAC-67449' into '5.2.0'
Jul 23, 2024
533158f
Merge branch 'shixin-ZSTAC-67877' into '5.2.0'
Jul 24, 2024
d45d9d9
<fix>[sdk]: Find GPUs of the same
ZqyDaoDao Jul 18, 2024
39a2733
Merge branch 'ZSTAC-67927@@2' into '5.2.0'
Jul 24, 2024
1f8eb31
<fix>[host]: support infiniband physical interface
bustezero Jul 25, 2024
197a2b2
Merge branch 'fix-67154@@2' into '5.2.0'
Jul 25, 2024
7e4b919
Merge branch 'shixin-ZSTAC-66807' into '5.1.9'
Jul 26, 2024
4dc0d7b
Merge branch 'cherry-pick-b95d85e2' into '5.2.0'
Jul 29, 2024
65281db
<fix>[l3network]: fix ipv4 netmask auto complete if set ip address
bustezero Jul 29, 2024
a576fdd
Merge branch 'fix-68046-5.2.0' into '5.2.0'
Jul 30, 2024
35406c1
<fix>[expon]: skip delete if volume deleted
PandaWuu Aug 5, 2024
0898a4c
<fix>[expon]: deactivate volume before adding volume to blacklist
PandaWuu Jul 22, 2024
d732011
Merge branch '5.2.0' into '5.2.0'
Aug 5, 2024
6045354
<fix>[compute]: enhance vm migrate extension point
MaJin1996 Mar 12, 2024
2ccdbe9
Merge branch 'fix-ext-exception@@2' into '5.2.0'
MaJin1996 Aug 6, 2024
cf599a2
<feature>[kvm]: add xmlhookVO resource and xmlhookVO crud
Jul 24, 2023
40619eb
<fix>[vm]: support update xml hook
Jul 22, 2024
c38ace8
<fix>[cluster]: xml hook detection is supported during UpdateClusterOS
Jul 25, 2024
910b79c
<fix>[kvm]: added xml hook error messages
Aug 8, 2024
14df3f0
<fix>[sdk]: update create vm from vm backup sdk
Aug 8, 2024
ec51524
Merge branch 'ZSTAC-65052@@2' into '5.2.0'
Aug 12, 2024
31764e8
Merge branch 'zstac-xml-hook@@3' into '5.2.0'
Aug 13, 2024
a5dae7e
<test>[testlib]: NoErrorCompletion.done() call twice <description>
ruansteve Aug 13, 2024
632be55
<fix>[console]: return true if console proxy not existed
ruansteve Aug 13, 2024
6821a75
Merge branch 'shixin-ZSTAC-68713' into '5.2.0'
ruansteve Aug 13, 2024
571aeca
Merge branch 'shixin-ZSTAC-60409' into '5.2.0'
Aug 13, 2024
44b440f
<fix>[expon]: ignore resource not found error
PandaWuu Aug 13, 2024
95d38c7
<fix>[virtualRouterProvider]: remove l3 <description>
ruansteve Aug 8, 2024
fd6f809
<fix>[conf]: delete wrong HostNetworkInterfaceLldpVO<description>
ruansteve Aug 14, 2024
b2498fc
Merge branch 'shixin-ZSTAC-68002@@2' into '5.2.0'
Aug 14, 2024
db91ea8
Merge branch 'shixin-ZSTAC-68699' into '5.2.0'
Aug 14, 2024
f383b79
<feature>[conf]: inspect baremetal2 chassis hardware info by instance
Jul 5, 2024
8f4bcdf
Merge branch 'feature-61603@@3' into '5.2.0'
Aug 14, 2024
9918a5d
Merge branch '5.2.0' into '5.2.0'
PandaWuu Aug 15, 2024
3cabe24
<feature>[guesttools]: Added the VM script
Aug 16, 2024
3738523
<fix>[flatNetworkProvider]: add interceptor for change dhcp server ip
ruansteve Aug 16, 2024
166ed5b
Merge branch 'shixin-ZSTAC-64632' into '5.2.0'
Aug 16, 2024
526121c
Merge branch 'feature-5.2.0-vm-script-library@@2' into '5.2.0'
Aug 19, 2024
3e220f4
<fix>[compute]: fix update xml hook error
Aug 19, 2024
d89280f
<fix>[conf]: delete jsonlabel after jsonlabel upgrade to xml hook
Aug 19, 2024
23e29e3
<fix>[mevoco]: check capacity before snapshot revert
MaJin1996 Apr 25, 2024
ef44550
Merge branch 'zstac-68952@@2' into '5.2.0'
Aug 20, 2024
361ef8b
<feature>[qga]: vm internal ip overwrite and conflict with ip range
bustezero Jul 22, 2024
5c202a7
Merge branch 'feature-5.2.0-ip-overwrite-final@@2' into '5.2.0'
Aug 21, 2024
d44a5cc
<fix>[virtualRouterProvider]: create user name tag after create vrouter
ruansteve Jul 8, 2024
2e6ee37
<feature>[plugin]: support for zbs primary storage
Apr 2, 2024
a14e252
Merge branch 'shixin-ZSTAC-67090@@3' into '5.2.0'
Aug 22, 2024
f8be77d
<fix>[utils]: avoid npe <description>
ruansteve Aug 21, 2024
e4eb003
Merge branch 'cherry-pick-2871c03b' into '5.2.0'
MaJin1996 Aug 22, 2024
0f31492
Merge branch 'shixin-ZSTAC-68936' into '5.2.0'
ruansteve Aug 22, 2024
e49d65e
<test>[vxlanNetwork]: vxlan network can not be mgt network
ruansteve Aug 22, 2024
deef454
<fix>[kvm]: skip the non-running and non-stopped VMS when do xml hook…
Aug 26, 2024
dd99be0
Merge branch 'shixin-ZSTAC-69155@@2' into '5.2.0'
Aug 26, 2024
65031ea
<fix>[ansible]: add nologging for "remote_pass" <description>
ruansteve Aug 26, 2024
0c84b9f
<fix>[snapshot]: fixed the issue where too many snapshots caused the …
Jul 29, 2024
e9a7d22
Merge branch 'shixin-ZSTAC-69177' into '5.2.0'
Aug 26, 2024
5365acf
Merge branch 'fix-modify-max-increment-snapshot-num@@2' into '5.2.0'
Aug 26, 2024
6c4b198
Merge branch 'zstac-69108@@2' into '5.2.0'
Aug 26, 2024
929d614
<fix>[sdk]: add gpu processing accelerators
ZqyDaoDao Jul 31, 2024
bee9de0
<fix>[compute]: fix getHostName use deprecated method occur npe
bustezero Aug 27, 2024
78e1ee3
Merge branch 'fix-69187@@2' into '5.2.0'
Aug 27, 2024
37ac2da
Merge branch 'ZSTAC-68855@@4' into '5.2.0'
Aug 27, 2024
eece50a
Merge branch 'gpuinto5.2.0@@4' into '5.2.0'
Aug 27, 2024
2fb884c
<fix>[conf]: add isDriverLoaded param for baremetal2 gpu
Aug 28, 2024
037686f
<fix>[sso]: support sso server
liang-hanyu Jun 12, 2024
67b582f
<fix>[compute]: avoid Throwable null message <description>
ruansteve Aug 28, 2024
85c9b9a
<fix>[ansible]: fix host pswd shell
MaJin1996 Aug 21, 2024
d56c8c7
<fix>[config]: update globalConfigOptions number range
Dec 21, 2023
0fb0e93
Merge branch 'ZSTAC-66833@@3' into '5.2.0'
Aug 28, 2024
f3e41c0
Merge branch 'fix-5.2.0@@2' into '5.2.0'
Aug 29, 2024
0c33b4c
Merge branch 'fix-host-pswd@@2' into '5.2.0'
Aug 29, 2024
75c4d5e
Merge branch 'fix-66043@@2' into '5.2.0'
Aug 29, 2024
1fa7859
<fix>[crypto]: fix encryption image cache error
liang-hanyu Jul 24, 2024
9533970
<fix>[kvm]: add update xml hook api timeout
Aug 29, 2024
dbed64e
<feature>[crypto]: support SanSec Secret resource
liang-hanyu Aug 16, 2024
35a3bee
Merge branch 'fix-65490@@2' into '5.2.0'
Aug 30, 2024
0f5fa4d
<fix>[network]: fix UsedIpVO order by ipInBinary to support ipv6
bustezero Aug 30, 2024
7cf1c80
Merge branch 'fix-69135@@2' into '5.2.0'
Aug 30, 2024
2e2b33f
<fix>[upgrade]: improvement grayscale upgrade checker
AlanJager Jun 21, 2024
fecdb8b
<fix>[upgrade]: add more trace log to UpgradeChecker
AlanJager Jun 21, 2024
c8d6573
<fix>[upgrade]: add fields usage check to agent commands
AlanJager Jun 26, 2024
4d5a672
<fix>[upgrade]: support grayscale api white list
AlanJager Jun 26, 2024
7ae0990
<fix>[compute]: support only update one host in cluster
AlanJager Jun 24, 2024
61a6e11
<fix>[virtualRouterProvider]: virtual router need version during ut
AlanJager Jun 24, 2024
b7db18f
<fix>[upgrade]: add APIUpdateClusterOSMsg to upgrade white list
AlanJager Jun 27, 2024
efa1662
<fix>[upgrade]: update long jobs to gray upgrade api white list
AlanJager Jun 30, 2024
f4a5184
<fix>[upgrade]: introduce global api interceptor
AlanJager Jul 3, 2024
04d7b71
<fix>[conf]: remove @ForeignKey of AgentVersionVO
AlanJager Jul 4, 2024
028a656
<fix>[upgrade]: rename skipInnerDeployOrInitOnCurrentAgent
AlanJager Jul 5, 2024
6c24be3
<fix>[nfsPrimaryStorage]: support grayscale upgrade on nfs over kvmagent
AlanJager Jul 5, 2024
80eaa6e
<test>[testlib]: add MessageNotifier as message hook
AlanJager Jul 5, 2024
734b50b
<fix>[localstorage]: local storage support grayscale upgrade
AlanJager Jul 5, 2024
c0a593c
<fix>[upgrade]: add default agent version to no version host
AlanJager Jul 5, 2024
cc69501
<fix>[sharedMountPointPrimaryStorage]: smp support grayscale upgrade
AlanJager Aug 30, 2024
f424cd6
<test>[testlib]: add asssert called method
AlanJager Jul 5, 2024
49d1375
<fix>[upgrade]: allow more api during grayscale upgrade
AlanJager Jul 8, 2024
bab10b7
<fix>[kvm]: disconnect host if kvmagent version null
AlanJager Jul 10, 2024
85f18c0
<fix>[kvm]: add detail actions to control host ping
AlanJager Jul 11, 2024
afe4aac
<fix>[doc]: update api doc
AlanJager Aug 29, 2024
d0accfd
<fix>[kvm]: change start vm params from boolean to Boolean
AlanJager Aug 30, 2024
983c1fb
Merge branch 'shixin-ZSTAC-69257' into '5.2.0'
Aug 30, 2024
03f9250
Merge branch 'grayscale-upgrade-to-5.2.0@@2' into '5.2.0'
Aug 31, 2024
5a59c7b
Merge branch 'xml_timeout@@2' into '5.2.0'
Sep 2, 2024
4166b9d
<fix>[cluster]: change update os parallelism degree to 10
AlanJager Jun 5, 2024
5aaf9bf
Merge branch 'fix-68984@@2' into '5.2.0'
Sep 2, 2024
99d2071
<feature>[flatNetworkProvider]: nicIp without gateway can not apply e…
ruansteve Sep 2, 2024
55169c2
Merge branch 'shixin-ZSTAC-69465' into '5.2.0'
ruansteve Sep 2, 2024
924d8fe
<fix>[kvm]: the concurrency of the restart operation of update xmlhoo…
Sep 3, 2024
b363650
Merge branch 'zstac-69444@@2' into '5.2.0'
Sep 3, 2024
800af16
Merge branch 'ZSTAC-66473@@2' into '5.2.0'
Sep 3, 2024
936833b
<fix>[compute]: autocomplete gateway address when setstaticip<descrip…
ruansteve Sep 4, 2024
5917bc5
<fix>[kvm]: update xmlhook check on UpdateClusterOSMsg
Sep 4, 2024
7126d3c
Merge branch 'zstack-58515@@2' into '5.2.0'
Sep 4, 2024
e512754
Merge branch 'shixin-ZSTAC-69465' into '5.2.0'
ruansteve Sep 4, 2024
5bf5b0a
<fix>[ansible]: fix sudo password echo
MaJin1996 Sep 4, 2024
0cf275c
<fix>[kvm]: update xmlhook check on UpdateClusterOSMsg
Sep 4, 2024
dafeae6
Merge branch 'zstack-58515@@2' into '5.2.0'
Sep 5, 2024
769d3b3
<fix>[vyos]: restart zvr when provision vpc if zvr is not running <de…
ruansteve Sep 5, 2024
54c49ed
<fix>[ceph]: correct ceph bs capacity calculation
May 7, 2024
e5d286e
<fix>[conf]: modify memory,power to Long type
Sep 5, 2024
6ace76f
Merge branch 'fix-ssh-pswd' into '5.2.0'
MaJin1996 Sep 5, 2024
48e97bc
Merge branch 'shixin-ZSTAC-69589' into '5.2.0'
ruansteve Sep 5, 2024
813ba85
Merge branch 'ZSTAC-69588@@2' into '5.2.0'
Sep 5, 2024
6bf0464
<fix>[conf]: fix mn unable to start after upgrade
Sep 5, 2024
f79a3aa
Merge branch 'fix-modify-max-increment-snapshot-num@@2' into '5.2.0'
Sep 9, 2024
921fdc2
Merge branch 'cherry-pick-93682e2e-3' into '5.2.0'
Sep 10, 2024
5cbecba
<fix>[utils]: ZSha2Info adds execUser parameter
liang-hanyu Sep 12, 2024
8d25fc0
Merge branch 'fix-69750@@2' into '5.2.0'
Sep 12, 2024
f46723c
<fix>[compute]: allocate ip to applianceVm even dhcp is disabled <des…
ruansteve Sep 14, 2024
87484c0
<fix>[core]: resolve release Glock hanging issue
liang-hanyu Sep 14, 2024
077a61b
Merge branch 'shixin-ZSTAC-69861@@2' into '5.2.0'
Sep 14, 2024
b763b85
Merge branch 'fix-69561' into '5.2.0'
Sep 17, 2024
bec65d5
<fix>[ansible]: update execution
Sep 18, 2024
346a5a5
Merge branch 'ZSTAC-69856' into '5.2.0'
Sep 18, 2024
796be69
<fix>[xinfini]: support xinfini
PandaWuu May 27, 2024
227dcf4
Merge branch 'xinfini@@4' into '5.2.1'
Sep 25, 2024
ed44b53
bump version to 5.2.1
PandaWuu Sep 25, 2024
055ac9c
Merge branch 'bump-version-5.2.1' into '5.2.1'
PandaWuu Sep 25, 2024
9b31ef8
<fix>[xinfini]: try to delete cloned volume which not exist in db
PandaWuu Sep 27, 2024
57d3c1d
Merge branch 'xinfini' into '5.2.1'
PandaWuu Sep 27, 2024
ef3e58a
<doc>[README]: Update readme content
ZStack-Robot Oct 16, 2024
994d93b
Merge branch 'master' into 'master'
ZStack-Robot Oct 16, 2024
62c59f3
<fix>[Doc]: Update repository contributors
ZStack-Robot Oct 17, 2024
5a29293
Merge branch 'master' into 'master'
ZStack-Robot Oct 17, 2024
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
Prev Previous commit
Next Next commit
<fix>[ansible]: update execution
update execution

Resolves: ZSTAC-69856

Change-Id: I647670796273687078766d737775676d70636867
  • Loading branch information
lin.ma committed Sep 18, 2024
commit bec65d5784c1a739f6b0ab328b1f49134f9695dd
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ public void deleteDestFile() {
private ErrorCode useNcatAndNmapToTestConnection(Ssh ssh) {
String srcScript = script.format(SshCmdHelper.shellQuote(password), callBackPort, callbackIp);

SshResult ret = ssh.setExecTimeout(60).shell(srcScript).setTimeout(60).runAndClose();
ssh.sudoCommand(srcScript);
SshResult ret = ssh.run();
ret.raiseExceptionIfFailed();

return null;
Expand Down