Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
c7b0005
UI support for extraconfig in deploy and update instance (#11719)
abh1sar Sep 30, 2025
c822028
CKS: generate a random UUID as password of CKS user in project (#11639)
weizhouapache Oct 1, 2025
1f436b6
server: Consider Instance in Starting state as well for allocation al…
sudo87 Oct 2, 2025
23dbe3c
CKS: fix CKS creation on an existing Shared and Routed network (#11735)
weizhouapache Oct 3, 2025
6da9414
VMware: match nic mac for ip address fetch (#10641)
alexandru-bagu Oct 4, 2025
9e46ee1
server: add user.password.reset.smtp.useStartTLS and enabledSecurityP…
weizhouapache Oct 7, 2025
77247b1
server: do not enable the disabled local storage(s) on host connectio…
sureshanaparti Oct 7, 2025
1fc1a5d
linstor: use sparse/discard qemu-img convert on thin devices (#11787)
rp- Oct 6, 2025
0c61d97
Add support for providing userdata to system VMs (#11654)
vishesh92 Oct 8, 2025
6f74ebf
Storage pool response improvements (#10740)
sureshanaparti Oct 8, 2025
4a9b4a4
refactor: remove use of term entry-point from extensions code base (#…
shwstppr Oct 8, 2025
39ef8f6
Add `Hypervisor default` as cache mode for disk offerings (#10282)
hsato03 Oct 8, 2025
572c520
systemvmtemplate: Bump Debian version to 12.12.0 (#11778)
weizhouapache Oct 8, 2025
9b8d822
UI: Deal with crosssite api call after login (#10533)
DaanHoogland Oct 8, 2025
1b6436d
UI: Fix primary storage for datastore cluster and retain traffic labe…
sudo87 Oct 8, 2025
2392bc8
Sanitize the rbd file cmd parameter logs during qemu-img convert (thr…
sureshanaparti Oct 8, 2025
53370cf
storage: change storage pool to Up state when cancel storage migratio…
weizhouapache Oct 8, 2025
80a3c0b
Initial primary storage pool plugin skeleton
Sep 30, 2025
db371e2
Initial primary storage pool plugin skeleton - added license string
rajiv-jain-netapp Oct 8, 2025
9bb758a
Initial primary storage pool plugin skeleton - added license string +…
rajiv-jain-netapp Oct 8, 2025
25fb255
Initial primary storage pool plugin skeleton - added license string +…
rajiv-jain-netapp Oct 8, 2025
6d933e8
Feignconfiguration and volume feignClient along with desired POJOs
rajiv-jain-netapp Oct 13, 2025
f07a444
Feignconfiguration and volume feignClient along with desired POJOs
rajiv-jain-netapp Oct 13, 2025
43867e6
Revert "Feignconfiguration and volume feignClient along with desired …
rajiv-jain-netapp Oct 13, 2025
4f57cd2
Revert "Feignconfiguration and volume feignClient along with desired …
rajiv-jain-netapp Oct 13, 2025
bd4a23a
Feignconfiguration and volume feignClient along with desired POJOs
rajiv-jain-netapp Oct 13, 2025
1bb907f
Feignconfiguration and volume feignClient along with desired POJOs
rajiv-jain-netapp Oct 13, 2025
3327c15
CSTACKEX-28: added copyright comment in the logger configuration
rajiv-jain-netapp Oct 13, 2025
35ccaab
CSTACKEX-28: added newline in the end of the file
rajiv-jain-netapp Oct 13, 2025
b4c2f30
CSTACKEX-28 - incorporated review comments
rajiv-jain-netapp Oct 14, 2025
8e4efd1
Cluster, SVM and Aggr Feign Client
suryag1201 Oct 16, 2025
d8b98ed
NAS and Job Feign Client
suryag1201 Oct 17, 2025
a20dc4e
# This is a combination of 11 commits. This is a combination of 10 c…
Oct 10, 2025
572a1d5
CSTACKEX-25: Basic class structure
Oct 17, 2025
0be388b
CSTACKEX-25: Added code for job polling and addressed the review comm…
Oct 21, 2025
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
refactor: remove use of term entry-point from extensions code base (a…
…pache#11488)

Addresses apache#11483

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
  • Loading branch information
shwstppr authored and Locharla, Sandeep committed Oct 21, 2025
commit 4a9b4a454ed5010d4cc68f017c18de161a415529
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ public class DeleteExtensionCmd extends BaseCmd {
private Long id;

@Parameter(name = ApiConstants.CLEANUP, type = CommandType.BOOLEAN,
entityType = ExtensionResponse.class, description = "Whether cleanup entry-point files for the extension")
entityType = ExtensionResponse.class,
description = "Whether to cleanup files for the extension. If true, the extension files will be deleted from all the management servers.")
private Boolean cleanup;

/////////////////////////////////////////////////////
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ public class ExtensionsManagerImpl extends ManagerBase implements ExtensionsMana

ConfigKey<Integer> PathStateCheckInterval = new ConfigKey<>("Advanced", Integer.class,
"extension.path.state.check.interval", "300",
"Interval (in seconds) for checking entry-point state of extensions",
"Interval (in seconds) for checking state of extensions path",
false, ConfigKey.Scope.Global);

@Inject
Expand Down Expand Up @@ -264,19 +264,19 @@ protected Pair<Boolean, String> getResultFromAnswersString(String answersStr, Ex

protected boolean prepareExtensionPathOnMSPeer(Extension extension, ManagementServerHostVO msHost) {
final String msPeer = Long.toString(msHost.getMsid());
logger.debug("Sending prepare extension entry-point for {} command to MS: {}", extension, msPeer);
logger.debug("Sending prepare extension path for {} command to MS: {}", extension, msPeer);
final Command[] commands = new Command[1];
commands[0] = new PrepareExtensionPathCommand(ManagementServerNode.getManagementServerId(), extension);
String answersStr = clusterManager.execute(msPeer, 0L, GsonHelper.getGson().toJson(commands), true);
return getResultFromAnswersString(answersStr, extension, msHost, "prepare entry-point").first();
return getResultFromAnswersString(answersStr, extension, msHost, "prepare path").first();
}

protected Pair<Boolean, String> prepareExtensionPathOnCurrentServer(String name, boolean userDefined,
String relativePath) {
try {
externalProvisioner.prepareExtensionPath(name, userDefined, relativePath);
} catch (CloudRuntimeException e) {
logger.error("Failed to prepare entry-point for Extension [name: {}, userDefined: {}, relativePath: {}] on this server",
logger.error("Failed to prepare path for Extension [name: {}, userDefined: {}, relativePath: {}] on this server",
name, userDefined, relativePath, e);
return new Pair<>(false, e.getMessage());
}
Expand All @@ -285,38 +285,38 @@ protected Pair<Boolean, String> prepareExtensionPathOnCurrentServer(String name,

protected boolean cleanupExtensionFilesOnMSPeer(Extension extension, ManagementServerHostVO msHost) {
final String msPeer = Long.toString(msHost.getMsid());
logger.debug("Sending cleanup extension entry-point for {} command to MS: {}", extension, msPeer);
logger.debug("Sending cleanup extension files for {} command to MS: {}", extension, msPeer);
final Command[] commands = new Command[1];
commands[0] = new CleanupExtensionFilesCommand(ManagementServerNode.getManagementServerId(), extension);
String answersStr = clusterManager.execute(msPeer, 0L, GsonHelper.getGson().toJson(commands), true);
return getResultFromAnswersString(answersStr, extension, msHost, "cleanup entry-point").first();
return getResultFromAnswersString(answersStr, extension, msHost, "cleanup files").first();
}

protected Pair<Boolean, String> cleanupExtensionFilesOnCurrentServer(String name, String relativePath) {
try {
externalProvisioner.cleanupExtensionPath(name, relativePath);
externalProvisioner.cleanupExtensionData(name, 0, true);
} catch (CloudRuntimeException e) {
logger.error("Failed to cleanup entry-point files for Extension [name: {}, relativePath: {}] on this server",
logger.error("Failed to cleanup files for Extension [name: {}, relativePath: {}] on this server",
name, relativePath, e);
return new Pair<>(false, e.getMessage());
}
return new Pair<>(true, null);
}

protected void cleanupExtensionFilesAcrossServers(Extension extension) {
boolean cleanup = true;
boolean cleanedUp = true;
List<ManagementServerHostVO> msHosts = managementServerHostDao.listBy(ManagementServerHost.State.Up);
for (ManagementServerHostVO msHost : msHosts) {
if (msHost.getMsid() == ManagementServerNode.getManagementServerId()) {
cleanup = cleanup && cleanupExtensionFilesOnCurrentServer(extension.getName(),
cleanedUp = cleanedUp && cleanupExtensionFilesOnCurrentServer(extension.getName(),
extension.getRelativePath()).first();
continue;
}
cleanup = cleanup && cleanupExtensionFilesOnMSPeer(extension, msHost);
cleanedUp = cleanedUp && cleanupExtensionFilesOnMSPeer(extension, msHost);
}
if (!cleanup) {
throw new CloudRuntimeException("Extension is deleted but its entry-point files are not cleaned up across servers");
if (!cleanedUp) {
throw new CloudRuntimeException("Extension is deleted but its files are not cleaned up across servers");
}
}

Expand All @@ -327,7 +327,7 @@ protected Pair<Boolean, String> getChecksumForExtensionPathOnMSPeer(Extension ex
cmds[0] = new GetExtensionPathChecksumCommand(ManagementServerNode.getManagementServerId(),
extension);
String answersStr = clusterManager.execute(msPeer, 0L, GsonHelper.getGson().toJson(cmds), true);
return getResultFromAnswersString(answersStr, extension, msHost, "prepare entry-point");
return getResultFromAnswersString(answersStr, extension, msHost, "get path checksum");
}

protected List<ExtensionCustomAction.Parameter> getParametersListFromMap(String actionName, Map parametersMap) {
Expand Down Expand Up @@ -549,7 +549,7 @@ protected void checkExtensionPathState(Extension extension, List<ManagementServe
final Pair<Boolean, String> msPeerChecksumResult = getChecksumForExtensionPathOnMSPeer(extension,
msHost);
if (!msPeerChecksumResult.first() || !checksum.equals(msPeerChecksumResult.second())) {
logger.error("Entry-point checksum for {} is different [msid: {}, checksum: {}] and [msid: {}, checksum: {}]",
logger.error("Path checksum for {} is different [msid: {}, checksum: {}] and [msid: {}, checksum: {}]",
extension, ManagementServerNode.getManagementServerId(), checksum, msHost.getMsid(),
(msPeerChecksumResult.first() ? msPeerChecksumResult.second() : "unknown"));
updateExtensionPathReady(extension, false);
Expand Down Expand Up @@ -630,7 +630,7 @@ public Extension createExtension(CreateExtensionCmd cmd) {
!prepareExtensionPathAcrossServers(extensionVO)) {
disableExtension(extensionVO.getId());
throw new CloudRuntimeException(String.format(
"Failed to enable extension: %s as it entry-point is not ready",
"Failed to enable extension: %s as its path is not ready",
extensionVO.getName()));
}
return extensionVO;
Expand Down Expand Up @@ -736,7 +736,7 @@ public Extension updateExtension(UpdateExtensionCmd cmd) {
!prepareExtensionPathAcrossServers(result)) {
disableExtension(result.getId());
throw new CloudRuntimeException(String.format(
"Failed to enable extension: %s as it entry-point is not ready",
"Failed to enable extension: %s as it path is not ready",
extensionVO.getName()));
}
updateAllExtensionHosts(extensionVO, null, false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -631,18 +631,18 @@ public void cleanupExtensionPath(String extensionName, String extensionRelativeP
}
if (!Files.isDirectory(filePath) && !Files.isRegularFile(filePath)) {
throw new CloudRuntimeException(
String.format("Failed to cleanup extension entry-point: %s for extension: %s as it either " +
String.format("Failed to cleanup path: %s for extension: %s as it either " +
"does not exist or is not a regular file/directory",
extensionName, extensionRelativePath));
}
if (!FileUtil.deleteRecursively(filePath)) {
throw new CloudRuntimeException(
String.format("Failed to delete extension entry-point: %s for extension: %s",
String.format("Failed to delete path: %s for extension: %s",
extensionName, filePath));
}
} catch (IOException e) {
throw new CloudRuntimeException(
String.format("Failed to cleanup extension entry-point: %s for extension: %s due to: %s",
String.format("Failed to cleanup path: %s for extension: %s due to: %s",
extensionName, normalizedPath, e.getMessage()), e);
}
}
Expand Down
12 changes: 6 additions & 6 deletions ui/src/views/extension/CreateExtension.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@
<template #label>
<tooltip-label :title="$t('label.path')" :tooltip="apiParams.path.description"/>
</template>
<div class="entry-point-input-container">
<span v-if="!!safeName" :title="extenstionBasePath" class="entry-point-input-base-path">
<div class="path-input-container">
<span v-if="!!safeName" :title="extenstionBasePath" class="path-input-base">
{{ extenstionBasePath }}
</span>
<a-input
v-model:value="form.path"
:placeholder="apiParams.path.description"
@input="markPathModified"
class="entry-point-input-relative-path"
class="path-input-relative"
/>
</div>
</a-form-item>
Expand Down Expand Up @@ -236,20 +236,20 @@ export default {
}
}

.entry-point-input-container {
.path-input-container {
display: flex;
align-items: center;
gap: 8px;
}

.entry-point-input-base-path {
.path-input-base {
max-width: 70%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}

.entry-point-input-relative-path {
.path-input-relative {
flex: 1 1 0%;
min-width: 0;
}
Expand Down