External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

esx: Improve object-by-type lookup performance

Browse Source 
Instead of using one big traversal spec for lookup use a set of
more fine grained traversal specs that are selected based on the
actual needs of the lookup.

This gives up to 20% speedup for certain operations like domain
listing due to less HTTP(S) traffic.
This commit is contained in:
Matthias Bolte 2010-08-21 18:49:18 +02:00
parent bb6543aaa4
commit 8c48743b97
3 changed files with 121 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/esx/esx_driver.c
View File

@ -3734,7 +3734,6 @@ esxNodeGetFreeMemory(virConnectPtr conn)
esxVI_LookupObjectContentByType(priv->primary, esxVI_LookupObjectContentByType(priv->primary,
priv->primary->computeResource->resourcePool, priv->primary->computeResource->resourcePool,
"ResourcePool", propertyNameList, "ResourcePool", propertyNameList,
esxVI_Boolean_False,
&resourcePool) < 0) { &resourcePool) < 0) {
goto cleanup; goto cleanup;
} }

223
src/esx/esx_vi.c
View File

@ -104,8 +104,12 @@ ESX_VI__TEMPLATE__FREE(Context,
esxVI_Datacenter_Free(&item->datacenter); esxVI_Datacenter_Free(&item->datacenter);
esxVI_ComputeResource_Free(&item->computeResource); esxVI_ComputeResource_Free(&item->computeResource);
esxVI_HostSystem_Free(&item->hostSystem); esxVI_HostSystem_Free(&item->hostSystem);
esxVI_SelectionSpec_Free(&item->fullTraversalSpecList); esxVI_SelectionSpec_Free(&item->selectSet_folderToChildEntity);
esxVI_SelectionSpec_Free(&item->fullTraversalSpecList2); esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToParent);
esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToVm);
esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToDatastore);
esxVI_SelectionSpec_Free(&item->selectSet_computeResourceToHost);
esxVI_SelectionSpec_Free(&item->selectSet_computeResourceToParentToParent);
}); });
static size_t static size_t
@ -450,23 +454,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url,
} }
if (esxVI_Login(ctx, username, password, NULL, &ctx->session) < 0 || if (esxVI_Login(ctx, username, password, NULL, &ctx->session) < 0 ||
esxVI_BuildFullTraversalSpecList(&ctx->fullTraversalSpecList) < 0) { esxVI_BuildSelectSetCollection(ctx) < 0) {
return -1;
}
/* Folder -> parent (Folder, Datacenter) */
if (esxVI_BuildFullTraversalSpecItem(&ctx->fullTraversalSpecList2,
"managedEntityToParent",
"ManagedEntity", "parent",
NULL) < 0) {
return -1;
}
/* ComputeResource -> parent (Folder) */
if (esxVI_BuildFullTraversalSpecItem(&ctx->fullTraversalSpecList2,
"computeResourceToParent",
"ComputeResource", "parent",
"managedEntityToParent\0") < 0) {
return -1; return -1;
} }
@ -495,7 +483,6 @@ esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx,
"hostFolder\0") < 0 || "hostFolder\0") < 0 ||
esxVI_LookupObjectContentByType(ctx, ctx->service->rootFolder, esxVI_LookupObjectContentByType(ctx, ctx->service->rootFolder,
"Datacenter", propertyNameList, "Datacenter", propertyNameList,
esxVI_Boolean_True,
&datacenterList) < 0) { &datacenterList) < 0) {
goto cleanup; goto cleanup;
} }
@ -545,7 +532,6 @@ esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx,
"resourcePool\0") < 0 || "resourcePool\0") < 0 ||
esxVI_LookupObjectContentByType(ctx, ctx->datacenter->hostFolder, esxVI_LookupObjectContentByType(ctx, ctx->datacenter->hostFolder,
"ComputeResource", propertyNameList, "ComputeResource", propertyNameList,
esxVI_Boolean_True,
&computeResourceList) < 0) { &computeResourceList) < 0) {
goto cleanup; goto cleanup;
} }
@ -607,7 +593,6 @@ esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx,
"name\0") < 0 || "name\0") < 0 ||
esxVI_LookupObjectContentByType(ctx, ctx->computeResource->_reference, esxVI_LookupObjectContentByType(ctx, ctx->computeResource->_reference,
"HostSystem", propertyNameList, "HostSystem", propertyNameList,
esxVI_Boolean_True,
&hostSystemList) < 0) { &hostSystemList) < 0) {
goto cleanup; goto cleanup;
} }
@ -684,7 +669,7 @@ esxVI_Context_LookupObjectsByHostSystemIp(esxVI_Context *ctx,
&managedObjectReference) < 0 || &managedObjectReference) < 0 ||
esxVI_LookupObjectContentByType(ctx, managedObjectReference, esxVI_LookupObjectContentByType(ctx, managedObjectReference,
"HostSystem", propertyNameList, "HostSystem", propertyNameList,
esxVI_Boolean_False, &hostSystem) < 0) { &hostSystem) < 0) {
goto cleanup; goto cleanup;
} }
@ -708,7 +693,6 @@ esxVI_Context_LookupObjectsByHostSystemIp(esxVI_Context *ctx,
"resourcePool\0") < 0 || "resourcePool\0") < 0 ||
esxVI_LookupObjectContentByType(ctx, hostSystem->obj, esxVI_LookupObjectContentByType(ctx, hostSystem->obj,
"ComputeResource", propertyNameList, "ComputeResource", propertyNameList,
esxVI_Boolean_True,
&computeResource) < 0) { &computeResource) < 0) {
goto cleanup; goto cleanup;
} }
@ -733,14 +717,6 @@ esxVI_Context_LookupObjectsByHostSystemIp(esxVI_Context *ctx,
"hostFolder\0") < 0 || "hostFolder\0") < 0 ||
esxVI_LookupObjectContentByType(ctx, computeResource->obj, esxVI_LookupObjectContentByType(ctx, computeResource->obj,
"Datacenter", propertyNameList, "Datacenter", propertyNameList,
/* FIXME: Passing Undefined here is a hack until
* esxVI_LookupObjectContentByType supports more
* fine grained traversal configuration. Looking
* up the Datacenter from the ComputeResource
* requiers an upward search. Putting this in the
* list with the other downward traversal rules
* would result in cyclic searching */
esxVI_Boolean_Undefined,
&datacenter) < 0) { &datacenter) < 0) {
goto cleanup; goto cleanup;
} }
@ -1406,15 +1382,15 @@ esxVI_Alloc(void **ptrptr, size_t size)
int int
esxVI_BuildFullTraversalSpecItem(esxVI_SelectionSpec **fullTraversalSpecList, esxVI_BuildSelectSet(esxVI_SelectionSpec **selectSet,
const char *name, const char *type, const char *name, const char *type,
const char *path, const char *selectSetNames) const char *path, const char *selectSetNames)
{ {
esxVI_TraversalSpec *traversalSpec = NULL; esxVI_TraversalSpec *traversalSpec = NULL;
esxVI_SelectionSpec *selectionSpec = NULL; esxVI_SelectionSpec *selectionSpec = NULL;
const char *currentSelectSetName = NULL; const char *currentSelectSetName = NULL;
if (fullTraversalSpecList == NULL) { if (selectSet == NULL || *selectSet != NULL) {
ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument"));
return -1; return -1;
} }
@ -1445,7 +1421,7 @@ esxVI_BuildFullTraversalSpecItem(esxVI_SelectionSpec **fullTraversalSpecList,
} }
} }
if (esxVI_SelectionSpec_AppendToList(fullTraversalSpecList, if (esxVI_SelectionSpec_AppendToList(selectSet,
esxVI_SelectionSpec_DynamicCast esxVI_SelectionSpec_DynamicCast
(traversalSpec)) < 0) { (traversalSpec)) < 0) {
goto failure; goto failure;
@ -1461,86 +1437,87 @@ esxVI_BuildFullTraversalSpecItem(esxVI_SelectionSpec **fullTraversalSpecList,
} }
int int
esxVI_BuildFullTraversalSpecList(esxVI_SelectionSpec **fullTraversalSpecList) esxVI_BuildSelectSetCollection(esxVI_Context *ctx)
{ {
if (fullTraversalSpecList == NULL || *fullTraversalSpecList != NULL) { /* Folder -> childEntity (ManagedEntity) */
ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); if (esxVI_BuildSelectSet(&ctx->selectSet_folderToChildEntity,
"folderToChildEntity",
"Folder", "childEntity",
"folderToChildEntity\0") < 0) {
return -1; return -1;
} }
/* Folder -> childEntity (ManagedEntity) */
if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList,
"folderToChildEntity",
"Folder", "childEntity",
"folderToChildEntity\0") < 0) {
goto failure;
}
/* ComputeResource -> host (HostSystem) */ /* ComputeResource -> host (HostSystem) */
if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, if (esxVI_BuildSelectSet(&ctx->selectSet_computeResourceToHost,
"computeResourceToHost", "computeResourceToHost",
"ComputeResource", "host", "ComputeResource", "host", NULL) < 0) {
NULL) < 0) { return -1;
goto failure;
} }
/* ComputeResource -> datastore (Datastore) */ /* ComputeResource -> datastore (Datastore) *//*
if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, if (esxVI_BuildSelectSet(&ctx->selectSet_computeResourceToDatastore,
"computeResourceToDatastore", "computeResourceToDatastore",
"ComputeResource", "datastore", "ComputeResource", "datastore", NULL) < 0) {
NULL) < 0) { return -1;
goto failure; }*/
}
/* ResourcePool -> resourcePool (ResourcePool) */ /* ResourcePool -> resourcePool (ResourcePool) *//*
if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, if (esxVI_BuildSelectSet(&ctx->selectSet_resourcePoolToVm,
"resourcePoolToResourcePool", "resourcePoolToResourcePool",
"ResourcePool", "resourcePool", "ResourcePool", "resourcePool",
"resourcePoolToResourcePool\0" "resourcePoolToResourcePool\0"
"resourcePoolToVm\0") < 0) { "resourcePoolToVm\0") < 0) {
goto failure; return -1;
} }*/
/* ResourcePool -> vm (VirtualMachine) */ /* ResourcePool -> vm (VirtualMachine) *//*
if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, if (esxVI_BuildSelectSet(&ctx->selectSet_resourcePoolToVm,
"resourcePoolToVm", "resourcePoolToVm",
"ResourcePool", "vm", NULL) < 0) { "ResourcePool", "vm", NULL) < 0) {
goto failure; return -1;
} }*/
/* HostSystem -> parent (ComputeResource) */ /* HostSystem -> parent (ComputeResource) */
if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, if (esxVI_BuildSelectSet(&ctx->selectSet_hostSystemToParent,
"hostSystemToParent", "hostSystemToParent",
"HostSystem", "parent", NULL) < 0) { "HostSystem", "parent", NULL) < 0) {
goto failure; return -1;
} }
/* HostSystem -> vm (VirtualMachine) */ /* HostSystem -> vm (VirtualMachine) */
if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, if (esxVI_BuildSelectSet(&ctx->selectSet_hostSystemToVm,
"hostSystemToVm", "hostSystemToVm",
"HostSystem", "vm", NULL) < 0) { "HostSystem", "vm", NULL) < 0) {
goto failure; return -1;
} }
/* HostSystem -> datastore (Datastore) */ /* HostSystem -> datastore (Datastore) */
if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, if (esxVI_BuildSelectSet(&ctx->selectSet_hostSystemToDatastore,
"hostSystemToDatastore", "hostSystemToDatastore",
"HostSystem", "datastore", NULL) < 0) { "HostSystem", "datastore", NULL) < 0) {
goto failure; return -1;
}
/* Folder -> parent (Folder, Datacenter) */
if (esxVI_BuildSelectSet(&ctx->selectSet_computeResourceToParentToParent,
"managedEntityToParent",
"ManagedEntity", "parent", NULL) < 0) {
return -1;
}
/* ComputeResource -> parent (Folder) */
if (esxVI_BuildSelectSet(&ctx->selectSet_computeResourceToParentToParent,
"computeResourceToParent",
"ComputeResource", "parent",
"managedEntityToParent\0") < 0) {
return -1;
} }
return 0; return 0;
failure:
esxVI_SelectionSpec_Free(fullTraversalSpecList);
return -1;
} }
/* /*
* Can't use the SessionIsActive() function here, because at least * Can't use the SessionIsActive() function here, because at least
* 'ESX Server 3.5.0 build-64607' returns an 'method not implemented' fault if * 'ESX Server 3.5.0 build-64607' returns an 'method not implemented' fault if
@ -1591,7 +1568,6 @@ esxVI_EnsureSession(esxVI_Context *ctx)
"currentSession") < 0 || "currentSession") < 0 ||
esxVI_LookupObjectContentByType(ctx, ctx->service->sessionManager, esxVI_LookupObjectContentByType(ctx, ctx->service->sessionManager,
"SessionManager", propertyNameList, "SessionManager", propertyNameList,
esxVI_Boolean_False,
&sessionManager) < 0) { &sessionManager) < 0) {
goto cleanup; goto cleanup;
} }
@ -1642,7 +1618,6 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx,
esxVI_ManagedObjectReference *root, esxVI_ManagedObjectReference *root,
const char *type, const char *type,
esxVI_String *propertyNameList, esxVI_String *propertyNameList,
esxVI_Boolean recurse,
esxVI_ObjectContent **objectContentList) esxVI_ObjectContent **objectContentList)
{ {
int result = -1; int result = -1;
@ -1650,11 +1625,6 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx,
esxVI_PropertySpec *propertySpec = NULL; esxVI_PropertySpec *propertySpec = NULL;
esxVI_PropertyFilterSpec *propertyFilterSpec = NULL; esxVI_PropertyFilterSpec *propertyFilterSpec = NULL;
if (ctx->fullTraversalSpecList == NULL) {
ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid call"));
return -1;
}
if (objectContentList == NULL || *objectContentList != NULL) { if (objectContentList == NULL || *objectContentList != NULL) {
ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument"));
return -1; return -1;
@ -1667,10 +1637,45 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx,
objectSpec->obj = root; objectSpec->obj = root;
objectSpec->skip = esxVI_Boolean_False; objectSpec->skip = esxVI_Boolean_False;
if (recurse == esxVI_Boolean_True) { if (STRNEQ(root->type, type)) {
objectSpec->selectSet = ctx->fullTraversalSpecList; if (STREQ(root->type, "Folder")) {
} else if (recurse == esxVI_Boolean_Undefined) { if (STREQ(type, "Datacenter") || STREQ(type, "ComputeResource")) {
objectSpec->selectSet = ctx->fullTraversalSpecList2; objectSpec->selectSet = ctx->selectSet_folderToChildEntity;
} else {
ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR,
_("Invalid lookup of '%s' from '%s'"),
type, root->type);
goto cleanup;
}
} else if (STREQ(root->type, "ComputeResource")) {
if (STREQ(type, "HostSystem")) {
objectSpec->selectSet = ctx->selectSet_computeResourceToHost;
} else if (STREQ(type, "Datacenter")) {
objectSpec->selectSet = ctx->selectSet_computeResourceToParentToParent;
} else {
ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR,
_("Invalid lookup of '%s' from '%s'"),
type, root->type);
goto cleanup;
}
} else if (STREQ(root->type, "HostSystem")) {
if (STREQ(type, "ComputeResource")) {
objectSpec->selectSet = ctx->selectSet_hostSystemToParent;
} else if (STREQ(type, "VirtualMachine")) {
objectSpec->selectSet = ctx->selectSet_hostSystemToVm;
} else if (STREQ(type, "Datastore")) {
objectSpec->selectSet = ctx->selectSet_hostSystemToDatastore;
} else {
ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR,
_("Invalid lookup of '%s' from '%s'"),
type, root->type);
goto cleanup;
}
} else {
ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR,
_("Invalid lookup from '%s'"), root->type);
goto cleanup;
}
} }
if (esxVI_PropertySpec_Alloc(&propertySpec) < 0) { if (esxVI_PropertySpec_Alloc(&propertySpec) < 0) {
@ -2210,7 +2215,7 @@ int esxVI_LookupHostSystemProperties(esxVI_Context *ctx,
{ {
return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference, return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference,
"HostSystem", propertyNameList, "HostSystem", propertyNameList,
esxVI_Boolean_False, hostSystem); hostSystem);
} }
@ -2224,7 +2229,6 @@ esxVI_LookupVirtualMachineList(esxVI_Context *ctx,
* for cluster support */ * for cluster support */
return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference, return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference,
"VirtualMachine", propertyNameList, "VirtualMachine", propertyNameList,
esxVI_Boolean_True,
virtualMachineList); virtualMachineList);
} }
@ -2267,7 +2271,6 @@ esxVI_LookupVirtualMachineByUuid(esxVI_Context *ctx, const unsigned char *uuid,
if (esxVI_LookupObjectContentByType(ctx, managedObjectReference, if (esxVI_LookupObjectContentByType(ctx, managedObjectReference,
"VirtualMachine", propertyNameList, "VirtualMachine", propertyNameList,
esxVI_Boolean_False,
virtualMachine) < 0) { virtualMachine) < 0) {
goto cleanup; goto cleanup;
} }
@ -2411,7 +2414,7 @@ esxVI_LookupDatastoreList(esxVI_Context *ctx, esxVI_String *propertyNameList,
* support */ * support */
return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference, return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference,
"Datastore", propertyNameList, "Datastore", propertyNameList,
esxVI_Boolean_True, datastoreList); datastoreList);
} }
@ -2590,8 +2593,7 @@ esxVI_LookupDatastoreHostMount(esxVI_Context *ctx,
if (esxVI_String_AppendValueToList(&propertyNameList, "host") < 0 || if (esxVI_String_AppendValueToList(&propertyNameList, "host") < 0 ||
esxVI_LookupObjectContentByType(ctx, datastore, "Datastore", esxVI_LookupObjectContentByType(ctx, datastore, "Datastore",
propertyNameList, esxVI_Boolean_False, propertyNameList, &objectContent) < 0) {
&objectContent) < 0) {
goto cleanup; goto cleanup;
} }
@ -2656,7 +2658,6 @@ esxVI_LookupTaskInfoByTask(esxVI_Context *ctx,
if (esxVI_String_AppendValueToList(&propertyNameList, "info") < 0 || if (esxVI_String_AppendValueToList(&propertyNameList, "info") < 0 ||
esxVI_LookupObjectContentByType(ctx, task, "Task", propertyNameList, esxVI_LookupObjectContentByType(ctx, task, "Task", propertyNameList,
esxVI_Boolean_False,
&objectContent) < 0) { &objectContent) < 0) {
goto cleanup; goto cleanup;
} }

16
src/esx/esx_vi.h
View File

@ -161,8 +161,12 @@ struct _esxVI_Context {
esxVI_Datacenter *datacenter; esxVI_Datacenter *datacenter;
esxVI_ComputeResource *computeResource; esxVI_ComputeResource *computeResource;
esxVI_HostSystem *hostSystem; esxVI_HostSystem *hostSystem;
esxVI_SelectionSpec *fullTraversalSpecList; esxVI_SelectionSpec *selectSet_folderToChildEntity;
esxVI_SelectionSpec *fullTraversalSpecList2; esxVI_SelectionSpec *selectSet_hostSystemToParent;
esxVI_SelectionSpec *selectSet_hostSystemToVm;
esxVI_SelectionSpec *selectSet_hostSystemToDatastore;
esxVI_SelectionSpec *selectSet_computeResourceToHost;
esxVI_SelectionSpec *selectSet_computeResourceToParentToParent;
}; };
int esxVI_Context_Alloc(esxVI_Context **ctx); int esxVI_Context_Alloc(esxVI_Context **ctx);
@ -266,12 +270,11 @@ int esxVI_List_Deserialize(xmlNodePtr node, esxVI_List **list,
int esxVI_Alloc(void **ptrptr, size_t size); int esxVI_Alloc(void **ptrptr, size_t size);
int esxVI_BuildFullTraversalSpecItem int esxVI_BuildSelectSet
(esxVI_SelectionSpec **fullTraversalSpecList, const char *name, (esxVI_SelectionSpec **selectSet, const char *name,
const char *type, const char *path, const char *selectSetNames); const char *type, const char *path, const char *selectSetNames);
int esxVI_BuildFullTraversalSpecList int esxVI_BuildSelectSetCollection(esxVI_Context *ctx);
(esxVI_SelectionSpec **fullTraversalSpecList);
int esxVI_EnsureSession(esxVI_Context *ctx); int esxVI_EnsureSession(esxVI_Context *ctx);
@ -279,7 +282,6 @@ int esxVI_LookupObjectContentByType(esxVI_Context *ctx,
esxVI_ManagedObjectReference *root, esxVI_ManagedObjectReference *root,
const char *type, const char *type,
esxVI_String *propertyNameList, esxVI_String *propertyNameList,
esxVI_Boolean recurse,
esxVI_ObjectContent **objectContentList); esxVI_ObjectContent **objectContentList);
int esxVI_GetManagedEntityStatus int esxVI_GetManagedEntityStatus