maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rollback waiting on children of a component when waiting on the component.

Browse source 
(cherry picked from commit d1ecc5a250)
This commit is contained in:
Cyrus Najmabadi 2019-02-27 12:12:23 -08:00
parent c53f697a6f
commit 34f83de210
5 changed files with 41 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CHANGELOG.md
View file

@ -1,4 +1,18 @@
## 0.16.16 (Unreleased)
## 0.16.18 (Unreleased)
### Improvements
## 0.16.17 (Released February 27th, 2019)
### Improvements
- Rolling back the change:
"Depending on a Resource will now depend on all other Resource's parented by that Resource."
Unforseen problems cropped up that caused deadlocks. Removing this change until we can
have a high quality solution without these issues.
## 0.16.16 (Released February 24th, 2019)
### Improvements

19
sdk/nodejs/resource.ts
View file

@ -35,21 +35,6 @@ export abstract class Resource {
*/
public readonly urn: Output<URN>;
/**
* The optional parent of this resource.
*/
// tslint:disable-next-line:variable-name
/* @internal */ public readonly __parentResource: Resource | undefined;
/**
* The child resources of this resource. Used so that if any resource wants to wait on this
* resource being complete, they will logically wait on all our child resources being complete
* as well.
*/
// tslint:disable-next-line:variable-name
/* @internal */ public __childResources: Set<Resource> | undefined;
/**
* When set to true, protect ensures this resource cannot be deleted.
*/
@ -104,10 +89,6 @@ export abstract class Resource {
throw new RunError(`Resource parent is not a valid Resource: ${opts.parent}`);
}
this.__parentResource = opts.parent;
this.__parentResource.__childResources = this.__parentResource.__childResources || new Set();
this.__parentResource.__childResources.add(this);
if (opts.protect === undefined) {
opts.protect = opts.parent.__protect;
}

62
sdk/nodejs/runtime/resource.ts
View file

@ -269,12 +269,6 @@ async function prepareResource(label: string, res: Resource, custom: boolean,
propertyToDirectDependencyURNs.set(propertyName, urns);
}
// Now await all dependencies transitively. i.e. if one resource depends on some other
// component resource, then it will end up depending on all the children of that component
// resource as well. That way, a parent acts as a "logical" collection of all those children
// and will not be considered complete until all of the children are complete as well.
await getResourceURNs(getTransitivelyReferencedChildResources(allDirectDependencies, res));
return {
resolveURN: resolveURN!,
resolveID: resolveID,
@ -302,62 +296,6 @@ async function getResourceURNs(resources: Set<Resource>) {
return result;
}
/**
* Recursively walk the resources passed in, returning them and all resources reachable from
* [Resource.__childResources]
*/
function getTransitivelyReferencedChildResources(resources: Set<Resource>, initialResource: Resource) {
// First, just recursively walk the dependent resources through their children, adding them to
// the result set.
const temp = new Set<Resource>();
addTransitivelyDependentResources(resources, temp);
// Then, remove any dependent resources we found that are actually children of this resource.
// Attempting to wait on them will simply cause a deadlock. This can happen in fairly trivial
// circumstances where a child uses data from a parent. For example:
//
// const bucket = new ...
// const notification = new BucketNotification(name, {
// bucketId: bucket.id
// }, { parent: bucket });
//
// Because notification has 'bucket' as it's parent, it will be in the child list of 'bucket'.
// However, it also depends on 'bucket' through the 'bucketId' property. We don't want to then
// have notification dependent on itself when it looks at the children of 'bucket'.
const final = new Set<Resource>();
for (const resource of temp) {
if (!isAncestor(resource, initialResource)) {
final.add(resource);
}
}
return final;
}
function addTransitivelyDependentResources(resources: Set<Resource> | undefined, result: Set<Resource>) {
if (resources) {
for (const resource of resources) {
if (!result.has(resource)) {
result.add(resource);
addTransitivelyDependentResources(resource.__childResources, result);
}
}
}
}
function isAncestor(resource: Resource | undefined, potentialAncestor: Resource) {
while (resource) {
if (resource === potentialAncestor) {
return true;
}
resource = resource.__parentResource;
}
return false;
}
/**
* Gathers explicit dependent Resources from a list of Resources (possibly Promises and/or Outputs).
*/

14
sdk/nodejs/tests/runtime/langhost/cases/022.parent_child_dependencies_2/index.js Normal file
View file

@ -0,0 +1,14 @@
// Test the ability to invoke provider functions via RPC.
let assert = require("assert");
let pulumi = require("../../../../../");
class MyResource extends pulumi.CustomResource {
constructor(name, args, opts) {
super("test:index:MyResource", name, args, opts);
}
}
let resA = new MyResource("resA");
let resB = new MyResource("resB", { parentId: resA.id }, { parent: resA });
let resC = new MyResource("resC", { parentId: resA.id }, { parent: resA });

12
sdk/nodejs/tests/runtime/langhost/run.spec.ts
View file

@ -604,9 +604,21 @@ describe("rpc", () => {
return { urn: makeUrn(t, name), id: undefined, props: undefined };
},
},
"parent_child_dependencies_2": {
pwd: path.join(base, "022.parent_child_dependencies_2"),
program: "./index.js",
expectResourceCount: 3,
registerResource: (ctx: any, dryrun: boolean, t: string, name: string) => {
return { urn: makeUrn(t, name), id: undefined, props: undefined };
},
},
};
for (const casename of Object.keys(cases)) {
// if (casename !== "parent_child_dependencies_2") {
// continue;
// }
const opts: RunCase = cases[casename];
it(`run test: ${casename} (pwd=${opts.pwd},prog=${opts.program})`, asyncTest(async () => {
// For each test case, run it twice: first to preview and then to update.