Changeset 1584

Timestamp:

10/30/08 12:42:05 (2 months ago)

Author:

peet

Message:

mark node as «undead» after it's re-join

Files:

• branches/0.4.7/shell/state/ddb.py (modified) (8 diffs)

branches/0.4.7/shell/state/ddb.py

@@ -594 +594 @@
-                        return ring
-
+        def state_running(self,node,hostname):
+                if node.watch.has_key(hostname):
+                        del node.watch[hostname]
+
+                a = self.mdns.getCache(hostname,types=[zeroconf._TYPE_TXT,])[0]
+                a.setProperty("state","running")
+
+
+        def state_stale(self,node,hostname):
+                node.watch[hostname].setProperty("state","stale")
+                del node.watch[hostname]
+                x = ACoreService(self.bus,self.bus.address)
+                x.nop()
+
-        @public
-        def dconfirm(self, index, addr):
+                rcpt = addr["from"].split("@")[-1]
-                node = self.get(index)
-addr["from"].split("@")[-1]
-del node.watch[addr["from"].split("@")[-1]]
+rcpt
+self.state_running(node,rcpt)
-                node.dconfirmed[addr["from"]] = index
-
-        @public
-        def uconfirm(self, index, data, addr):
+                rcpt = addr["from"].split("@")[-1]
-                node = self.get(index)
-addr["from"].split("@")[-1]
-del node.watch[addr["from"].split("@")[-1]]
+rcpt
+self.state_running(node,rcpt)
-                node.uconfirmed[addr["from"]] = {
-                        "index": index,
@@ -613 +629 @@
-        @public
-        def confirm(self, new_index, index, data, addr):
+                rcpt = addr["from"].split("@")[-1]
-                node = self.get(index)
-addr["from"].split("@")[-1]
-del node.watch[addr["from"].split("@")[-1]]
+rcpt
+self.state_running(node,rcpt)
-                node.aconfirmed[addr["from"]] = {
-                        "new_index": new_index,
@@ -645 +662 @@
-                                if node.watch.has_key(hostname):
-                                        self.log("critical","Node sync (add) watchdog: low watermark touch; mark node as stale")
-
-
-
-
+
-                else:
-                        self.log("debug","Node sync watchdog for host `%s` terminated: confirmed" % (hostname))
@@ -674 +688 @@
-                                if node.watch.has_key(hostname):
-                                        self.log("critical","Node sync (update) watchdog: low watermark touch; mark node as stale")
-
-
-
-
+
-                else:
-                        self.log("debug","Node sync watchdog for host `%s` terminated: confirmed" % (hostname))
@@ -703 +714 @@
-                                if node.watch.has_key(hostname):
-                                        self.log("critical","Node sync (del) watchdog: low watermark touch; mark node as stale")
-
-
-
-
+
-                else:
-                        self.log("debug","Node sync watchdog for host `%s` terminated: confirmed" % (hostname))
@@ -729 +737 @@
-                for i in x:
-                        a = self.mdns.getCache(i,types=[zeroconf._TYPE_TXT,])[0]
-2
+5
-                        if a.properties.has_key("state"):
-                                if a.properties["state"] != "stale":
-                                        node.watch[i] = a
-                                        node.dsync[i] = 5
-                        self._t_del(i,index)
-                        
@@ -783 +790 @@
-                for i in x:
-                        a = self.mdns.getCache(i,types=[zeroconf._TYPE_TXT,])[0]
-2
+5
-                        if a.properties.has_key("state"):
-                                if a.properties["state"] != "stale":
-                                        node.watch[i] = a
-                                        node.usync[i] = 5
-                        self._t_update(i,p)
-                        
@@ -869 +875 @@
-                for i in x:
-                        a = self.mdns.getCache(i,types=[zeroconf._TYPE_TXT,])[0]
-2
+5
-                        if a.properties.has_key("state"):
-                                if a.properties["state"] != "stale":
-                                        node.watch[i] = a
-                                        node.async[i] = 5
-                        self._t_add(i,p)
-                #