luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Properly manage the lifecycle of allocations for storage nodes and controllers

This commit is contained in:
Michael Lange 2020-05-11 19:59:38 -07:00
parent c84070fc42
commit de74239430
4 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/app/components/allocation-row.js
View File

@ -46,6 +46,10 @@ export default Component.extend({
},
didReceiveAttrs() {
this.updateStatsTracker();
},
updateStatsTracker() {
const allocation = this.allocation;
if (allocation) {

20
ui/app/components/plugin-allocation-row.js
View File

@ -1,7 +1,23 @@
import { alias } from '@ember/object/computed';
import AllocationRow from 'nomad-ui/components/allocation-row';
export default AllocationRow.extend({
pluginAllocation: null,
allocation: alias('pluginAllocation.allocation'),
allocation: null,
didReceiveAttrs() {
this.setAllocation();
},
// The allocation for the plugin's controller or storage plugin needs
// to be imperatively fetched since these plugins are Fragments which
// can't have relationships.
async setAllocation() {
if (this.pluginAllocation && !this.allocation) {
const allocation = await this.pluginAllocation.getAllocation();
if (!this.isDestroyed) {
this.set('allocation', allocation);
this.updateStatsTracker();
}
}
},
});

17
ui/app/models/storage-controller.js
View File

@ -1,9 +1,7 @@
import { computed } from '@ember/object';
import attr from 'ember-data/attr';
import { belongsTo } from 'ember-data/relationships';
import Fragment from 'ember-data-model-fragments/fragment';
import { fragmentOwner } from 'ember-data-model-fragments/attributes';
import PromiseObject from 'nomad-ui/utils/classes/promise-object';
export default Fragment.extend({
plugin: fragmentOwner(),
@ -11,16 +9,6 @@ export default Fragment.extend({
node: belongsTo('node'),
allocID: attr('string'),
// Model fragments don't support relationships, but with an allocation ID
// a "belongsTo" can be sufficiently mocked.
allocation: computed('allocID', function() {
if (!this.allocID) return null;
return PromiseObject.create({
promise: this.store.findRecord('allocation', this.allocID),
reload: () => this.store.findRecord('allocation', this.allocID),
});
}),
provider: attr('string'),
version: attr('string'),
healthy: attr('boolean'),
@ -30,4 +18,9 @@ export default Fragment.extend({
requiresTopologies: attr('boolean'),
controllerInfo: attr(),
// Fragments can't have relationships, so provider a manual getter instead.
async getAllocation() {
return this.store.findRecord('allocation', this.allocID);
},
});

17
ui/app/models/storage-node.js
View File

@ -1,9 +1,7 @@
import { computed } from '@ember/object';
import attr from 'ember-data/attr';
import { belongsTo } from 'ember-data/relationships';
import Fragment from 'ember-data-model-fragments/fragment';
import { fragmentOwner } from 'ember-data-model-fragments/attributes';
import PromiseObject from 'nomad-ui/utils/classes/promise-object';
export default Fragment.extend({
plugin: fragmentOwner(),
@ -11,16 +9,6 @@ export default Fragment.extend({
node: belongsTo('node'),
allocID: attr('string'),
// Model fragments don't support relationships, but with an allocation ID
// a "belongsTo" can be sufficiently mocked.
allocation: computed('allocID', function() {
if (!this.allocID) return null;
return PromiseObject.create({
promise: this.store.findRecord('allocation', this.allocID),
reload: () => this.store.findRecord('allocation', this.allocID),
});
}),
provider: attr('string'),
version: attr('string'),
healthy: attr('boolean'),
@ -30,4 +18,9 @@ export default Fragment.extend({
requiresTopologies: attr('boolean'),
nodeInfo: attr(),
// Fragments can't have relationships, so provider a manual getter instead.
async getAllocation() {
return this.store.findRecord('allocation', this.allocID);
},
});