Skip to content

Commit 1b63245

Browse files
weizhouapacheweizhouapache
authored
Merge branch 'main' into 4.21-md5sum-to-sha512sum
2 parents ed628f3 + ca0c353 commit 1b63245

File tree

43 files changed

+151
-75
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+151
-75
lines changed

‎agent/src/main/java/com/cloud/agent/resource/DummyResource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.HashMap;
2121
import java.util.List;
2222
import java.util.Map;
23-
import java.util.UUID;
2423

2524
import com.cloud.agent.IAgentControl;
2625
import com.cloud.agent.api.Answer;
@@ -40,6 +39,7 @@
4039
import com.cloud.storage.Storage;
4140
import com.cloud.storage.Storage.StoragePoolType;
4241
import com.cloud.utils.StringUtils;
42+
import com.cloud.utils.UuidUtils;
4343

4444
public class DummyResource implements ServerResource {
4545
String _name;
@@ -133,7 +133,7 @@ protected StoragePoolInfo initializeLocalStorage() {
133133
String hostIp = getConfiguredProperty("private.ip.address", "127.0.0.1");
134134
String localStoragePath = getConfiguredProperty("local.storage.path", "/mnt");
135135
String lh = hostIp + localStoragePath;
136-
String uuid = UUID.nameUUIDFromBytes(lh.getBytes(StringUtils.getPreferredCharset())).toString();
136+
String uuid = UuidUtils.nameUUIDFromBytes(lh.getBytes(StringUtils.getPreferredCharset())).toString();
137137

138138
String capacity = getConfiguredProperty("local.storage.capacity", "1000000000");
139139
String available = getConfiguredProperty("local.storage.avail", "10000000");

‎core/src/main/java/com/cloud/agent/api/DeleteStoragePoolCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121

2222
import java.io.File;
2323
import java.util.Map;
24-
import java.util.UUID;
2524

2625
import com.cloud.agent.api.to.StorageFilerTO;
2726
import com.cloud.storage.StoragePool;
27+
import com.cloud.utils.UuidUtils;
2828

2929
public class DeleteStoragePoolCommand extends Command {
3030
public static final String DATASTORE_NAME = "datastoreName";
@@ -49,7 +49,7 @@ public DeleteStoragePoolCommand(StoragePool pool, String localPath) {
4949
}
5050

5151
public DeleteStoragePoolCommand(StoragePool pool) {
52-
this(pool, LOCAL_PATH_PREFIX + File.separator + UUID.nameUUIDFromBytes((pool.getHostAddress() + pool.getPath()).getBytes()));
52+
this(pool, LOCAL_PATH_PREFIX + File.separator + UuidUtils.nameUUIDFromBytes((pool.getHostAddress() + pool.getPath()).getBytes()));
5353
}
5454

5555
public void setPool(StoragePool pool) {

‎core/src/main/java/com/cloud/agent/api/ModifyStoragePoolCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121

2222
import java.io.File;
2323
import java.util.Map;
24-
import java.util.UUID;
2524

2625
import com.cloud.agent.api.to.StorageFilerTO;
2726
import com.cloud.storage.StoragePool;
27+
import com.cloud.utils.UuidUtils;
2828

2929
public class ModifyStoragePoolCommand extends Command {
3030
public static final String LOCAL_PATH_PREFIX = "/mnt/";
@@ -47,11 +47,11 @@ public ModifyStoragePoolCommand(boolean add, StoragePool pool, String localPath,
4747
}
4848

4949
public ModifyStoragePoolCommand(boolean add, StoragePool pool, Map<String, String> details) {
50-
this(add, pool, LOCAL_PATH_PREFIX + File.separator + UUID.nameUUIDFromBytes((pool.getHostAddress() + pool.getPath()).getBytes()), details);
50+
this(add, pool, LOCAL_PATH_PREFIX + File.separator + UuidUtils.nameUUIDFromBytes((pool.getHostAddress() + pool.getPath()).getBytes()), details);
5151
}
5252

5353
public ModifyStoragePoolCommand(boolean add, StoragePool pool) {
54-
this(add, pool, LOCAL_PATH_PREFIX + File.separator + UUID.nameUUIDFromBytes((pool.getHostAddress() + pool.getPath()).getBytes()));
54+
this(add, pool, LOCAL_PATH_PREFIX + File.separator + UuidUtils.nameUUIDFromBytes((pool.getHostAddress() + pool.getPath()).getBytes()));
5555
}
5656

5757
public boolean getAdd() {

‎engine/schema/src/main/java/com/cloud/storage/VMTemplateVO.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
import com.cloud.cpu.CPU;
3636
import com.cloud.user.UserData;
37+
import com.cloud.utils.UuidUtils;
3738
import org.apache.cloudstack.util.CPUArchConverter;
3839
import org.apache.cloudstack.util.HypervisorTypeConverter;
3940
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
@@ -344,7 +345,7 @@ private static String generateUniqueName(long id, long userId, String displayNam
344345
name.append("-");
345346
name.append(userId);
346347
name.append("-");
347-
name.append(UUID.nameUUIDFromBytes((displayName + System.currentTimeMillis()).getBytes()).toString());
348+
name.append(UuidUtils.nameUUIDFromBytes((displayName + System.currentTimeMillis()).getBytes()).toString());
348349
return name.toString();
349350
}
350351

‎engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/SnapshotTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
import com.cloud.storage.dao.SnapshotDao;
101101
import com.cloud.storage.dao.VMTemplateDao;
102102
import com.cloud.storage.dao.VolumeDao;
103+
import com.cloud.utils.UuidUtils;
103104
import com.cloud.utils.component.ComponentContext;
104105

105106
import junit.framework.Assert;
@@ -287,7 +288,7 @@ protected void injectMockito() {
287288

288289
public DataStore createPrimaryDataStore() {
289290
try {
290-
String uuid = UUID.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString();
291+
String uuid = UuidUtils.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString();
291292
List<StoragePoolVO> pools = primaryDataStoreDao.findPoolByName(this.primaryName);
292293
if (pools.size() > 0) {
293294
return this.dataStoreMgr.getPrimaryDataStore(pools.get(0).getId());

‎engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeServiceTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
import com.cloud.storage.VolumeVO;
8383
import com.cloud.storage.dao.VMTemplateDao;
8484
import com.cloud.storage.dao.VolumeDao;
85+
import com.cloud.utils.UuidUtils;
8586
import com.cloud.utils.component.ComponentContext;
8687

8788
@ContextConfiguration(locations = {"classpath:/storageContext.xml"})
@@ -281,7 +282,7 @@ public void testCreatePrimaryStorage() {
281282
params.put("name", this.primaryName);
282283
params.put("port", "1");
283284
params.put("roles", DataStoreRole.Primary.toString());
284-
params.put("uuid", UUID.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString());
285+
params.put("uuid", UuidUtils.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString());
285286
params.put("providerName", String.valueOf(provider.getName()));
286287

287288
DataStoreLifeCycle lifeCycle = provider.getDataStoreLifeCycle();
@@ -324,7 +325,7 @@ public DataStore createPrimaryDataStore() {
324325
params.put("name", this.primaryName);
325326
params.put("port", "1");
326327
params.put("roles", DataStoreRole.Primary.toString());
327-
params.put("uuid", UUID.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString());
328+
params.put("uuid", UuidUtils.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString());
328329
params.put("providerName", String.valueOf(provider.getName()));
329330

330331
DataStoreLifeCycle lifeCycle = provider.getDataStoreLifeCycle();

‎engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTestVmware.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
import com.cloud.storage.VolumeVO;
8787
import com.cloud.storage.dao.VMTemplateDao;
8888
import com.cloud.storage.dao.VolumeDao;
89+
import com.cloud.utils.UuidUtils;
8990
import com.cloud.utils.component.ComponentContext;
9091

9192
@ContextConfiguration(locations = {"classpath:/storageContext.xml"})
@@ -264,7 +265,7 @@ protected void injectMockito() {
264265

265266
public DataStore createPrimaryDataStore() {
266267
try {
267-
String uuid = UUID.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString();
268+
String uuid = UuidUtils.nameUUIDFromBytes(this.getPrimaryStorageUrl().getBytes()).toString();
268269
List<StoragePoolVO> pools = primaryDataStoreDao.findPoolByName(this.primaryName);
269270
if (pools.size() > 0) {
270271
return this.dataStoreMgr.getPrimaryDataStore(pools.get(0).getId());

‎packaging/systemd/cloudstack-agent.service‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ After=libvirtd.service
2828
[Service]
2929
Type=simple
3030
EnvironmentFile=/etc/default/cloudstack-agent
31+
ExecStartPre=/usr/share/cloudstack-common/scripts/installer/pre-check.sh
3132
ExecStart=/usr/bin/java $JAVA_OPTS $JAVA_DEBUG -cp $CLASSPATH $JAVA_CLASS
3233
Restart=always
3334
RestartSec=10s

‎packaging/systemd/cloudstack-management.service‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ User=cloud
3434
EnvironmentFile=/etc/default/cloudstack-management
3535
WorkingDirectory=/var/log/cloudstack/management
3636
PIDFile=/var/run/cloudstack-management.pid
37+
ExecStartPre=/usr/share/cloudstack-common/scripts/installer/pre-check.sh
3738
ExecStart=/usr/bin/java $JAVA_DEBUG $JAVA_OPTS -cp $CLASSPATH $BOOTSTRAP_CLASS
3839
StandardOutput=append:/var/log/cloudstack/management/management-server.out
3940
StandardError=append:/var/log/cloudstack/management/management-server.err

‎packaging/systemd/cloudstack-usage.service‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ After=network.target network-online.target mariadb.service mysqld.service mysql.
3232
Type=simple
3333
EnvironmentFile=/etc/default/cloudstack-usage
3434
Environment=JAVA_PID=$$
35+
ExecStartPre=/usr/share/cloudstack-common/scripts/installer/pre-check.sh
3536
ExecStart=/bin/sh -ec '/usr/bin/java -Dpid=${JAVA_PID} $JAVA_OPTS $JAVA_DEBUG -cp $CLASSPATH $JAVA_CLASS'
3637
Restart=always
3738
RestartSec=10s

0 commit comments

Comments
 (0)