Commit 9084e196 authored by Cédric Le Ninivin's avatar Cédric Le Ninivin Committed by Cédric Le Ninivin

slapos_cloud: Add useRevision to SoftwareInstance

parent 39b34a38
...@@ -183,6 +183,9 @@ class SoftwareInstance(Item, JSONType): ...@@ -183,6 +183,9 @@ class SoftwareInstance(Item, JSONType):
def getSlapTimestamp(self): def getSlapTimestamp(self):
return self._getSlapTimestamp() return self._getSlapTimestamp()
def useRevision(self):
return getattr(self, "use_jio_api_revision", False)
@UnrestrictedMethod @UnrestrictedMethod
def _getSlapTimestamp(self): def _getSlapTimestamp(self):
compute_partition = self.getAggregateValue(portal_type="Compute Partition") compute_partition = self.getAggregateValue(portal_type="Compute Partition")
...@@ -198,6 +201,8 @@ class SoftwareInstance(Item, JSONType): ...@@ -198,6 +201,8 @@ class SoftwareInstance(Item, JSONType):
# XXX In the current what shared instances are processed, they cannot be reprocessed if the # XXX In the current what shared instances are processed, they cannot be reprocessed if the
# host instance is not processed # host instance is not processed
if (self.getPortalType() == "Software Instance"): if (self.getPortalType() == "Software Instance"):
shared_instance_sql_list = []
if self.useRevision():
shared_instance_sql_list = self.getPortalObject().portal_catalog.unrestrictedSearchResults( shared_instance_sql_list = self.getPortalObject().portal_catalog.unrestrictedSearchResults(
default_aggregate_uid=compute_partition.getUid(), default_aggregate_uid=compute_partition.getUid(),
portal_type='Slave Instance', portal_type='Slave Instance',
...@@ -207,13 +212,20 @@ class SoftwareInstance(Item, JSONType): ...@@ -207,13 +212,20 @@ class SoftwareInstance(Item, JSONType):
limit=1, limit=1,
**{"slapos_item.slap_state": "start_requested"} **{"slapos_item.slap_state": "start_requested"}
) )
if shared_instance_sql_list: else:
shared_instance = shared_instance_sql_list[0].getObject() shared_instance_sql_list = self.getPortalObject().portal_catalog.unrestrictedSearchResults(
most_recent_hosted_instance_timestamp = int( default_aggregate_uid=compute_partition.getUid(),
shared_instance.getBangTimestamp(int(shared_instance.getModificationDate())) portal_type='Slave Instance',
validation_state="validated",
**{"slapos_item.slap_state": "start_requested"}
) )
if (most_recent_hosted_instance_timestamp > timestamp): for shared_instance in shared_instance_sql_list:
timestamp = most_recent_hosted_instance_timestamp shared_instance = _assertACI(shared_instance.getObject())
# XXX Use catalog to filter more efficiently
if shared_instance.getSlapState() == "start_requested":
newtimestamp = int(shared_instance.getBangTimestamp(int(shared_instance.getModificationDate())))
if (newtimestamp > timestamp):
timestamp = newtimestamp
return timestamp return timestamp
...@@ -397,6 +409,7 @@ class SoftwareInstance(Item, JSONType): ...@@ -397,6 +409,7 @@ class SoftwareInstance(Item, JSONType):
"access_status_message": self.getTextAccessStatus(), "access_status_message": self.getTextAccessStatus(),
"portal_type": self.getPortalType(), "portal_type": self.getPortalType(),
} }
if self.useRevision():
web_section = self.getWebSectionValue() web_section = self.getWebSectionValue()
web_section = web_section.getRelativeUrl() if web_section else self.REQUEST.get("web_section_relative_url", None) web_section = web_section.getRelativeUrl() if web_section else self.REQUEST.get("web_section_relative_url", None)
if web_section: if web_section:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment