tom | b41d1ac | 2014-09-24 01:51:24 -0700 | [diff] [blame] | 1 | package org.onlab.onos.store.cluster.impl; |
| 2 | |
alshabib | 339a3d9 | 2014-09-26 17:54:32 -0700 | [diff] [blame] | 3 | import static org.onlab.onos.cluster.MastershipEvent.Type.MASTER_CHANGED; |
| 4 | |
| 5 | import java.util.Map; |
alshabib | 339a3d9 | 2014-09-26 17:54:32 -0700 | [diff] [blame] | 6 | import java.util.Set; |
Yuta HIGUCHI | c8e19d4 | 2014-09-24 17:20:52 -0700 | [diff] [blame] | 7 | |
tom | b41d1ac | 2014-09-24 01:51:24 -0700 | [diff] [blame] | 8 | import org.apache.felix.scr.annotations.Activate; |
| 9 | import org.apache.felix.scr.annotations.Component; |
| 10 | import org.apache.felix.scr.annotations.Deactivate; |
| 11 | import org.apache.felix.scr.annotations.Reference; |
| 12 | import org.apache.felix.scr.annotations.ReferenceCardinality; |
| 13 | import org.apache.felix.scr.annotations.Service; |
| 14 | import org.onlab.onos.cluster.ClusterService; |
| 15 | import org.onlab.onos.cluster.MastershipEvent; |
| 16 | import org.onlab.onos.cluster.MastershipStore; |
tom | 0755a36 | 2014-09-24 11:54:43 -0700 | [diff] [blame] | 17 | import org.onlab.onos.cluster.MastershipStoreDelegate; |
Ayaka Koshibe | b70d34b | 2014-09-25 15:43:01 -0700 | [diff] [blame] | 18 | import org.onlab.onos.cluster.MastershipTerm; |
tom | b41d1ac | 2014-09-24 01:51:24 -0700 | [diff] [blame] | 19 | import org.onlab.onos.cluster.NodeId; |
| 20 | import org.onlab.onos.net.DeviceId; |
| 21 | import org.onlab.onos.net.MastershipRole; |
Yuta HIGUCHI | b5df76d | 2014-09-27 20:54:00 -0700 | [diff] [blame] | 22 | import org.onlab.onos.store.common.AbstractHazelcastStore; |
tom | b41d1ac | 2014-09-24 01:51:24 -0700 | [diff] [blame] | 23 | |
alshabib | 339a3d9 | 2014-09-26 17:54:32 -0700 | [diff] [blame] | 24 | import com.google.common.collect.ImmutableSet; |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 25 | import com.hazelcast.core.ILock; |
alshabib | 339a3d9 | 2014-09-26 17:54:32 -0700 | [diff] [blame] | 26 | import com.hazelcast.core.IMap; |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 27 | import com.hazelcast.core.MultiMap; |
tom | b41d1ac | 2014-09-24 01:51:24 -0700 | [diff] [blame] | 28 | |
| 29 | /** |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 30 | * Distributed implementation of the mastership store. The store is |
| 31 | * responsible for the master selection process. |
tom | b41d1ac | 2014-09-24 01:51:24 -0700 | [diff] [blame] | 32 | */ |
| 33 | @Component(immediate = true) |
| 34 | @Service |
tom | 0755a36 | 2014-09-24 11:54:43 -0700 | [diff] [blame] | 35 | public class DistributedMastershipStore |
Yuta HIGUCHI | 2e96389 | 2014-09-27 13:00:39 -0700 | [diff] [blame] | 36 | extends AbstractHazelcastStore<MastershipEvent, MastershipStoreDelegate> |
alshabib | 339a3d9 | 2014-09-26 17:54:32 -0700 | [diff] [blame] | 37 | implements MastershipStore { |
tom | b41d1ac | 2014-09-24 01:51:24 -0700 | [diff] [blame] | 38 | |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 39 | //arbitrary lock name |
| 40 | private static final String LOCK = "lock"; |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 41 | //initial term/TTL value |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 42 | private static final Integer INIT = 0; |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 43 | |
| 44 | //devices to masters |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 45 | protected IMap<byte[], byte[]> masters; |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 46 | //devices to terms |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 47 | protected IMap<byte[], Integer> terms; |
| 48 | |
| 49 | //re-election related, disjoint-set structures: |
| 50 | //device-nodes multiset of available nodes |
| 51 | protected MultiMap<byte[], byte[]> standbys; |
| 52 | //device-nodes multiset for nodes that have given up on device |
| 53 | protected MultiMap<byte[], byte[]> unusable; |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 54 | |
tom | b41d1ac | 2014-09-24 01:51:24 -0700 | [diff] [blame] | 55 | @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) |
| 56 | protected ClusterService clusterService; |
| 57 | |
Ayaka Koshibe | 406d010 | 2014-09-24 16:08:12 -0700 | [diff] [blame] | 58 | @Override |
tom | b41d1ac | 2014-09-24 01:51:24 -0700 | [diff] [blame] | 59 | @Activate |
| 60 | public void activate() { |
| 61 | super.activate(); |
| 62 | |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 63 | masters = theInstance.getMap("masters"); |
| 64 | terms = theInstance.getMap("terms"); |
| 65 | standbys = theInstance.getMultiMap("backups"); |
| 66 | unusable = theInstance.getMultiMap("unusable"); |
tom | b41d1ac | 2014-09-24 01:51:24 -0700 | [diff] [blame] | 67 | |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 68 | masters.addEntryListener(new RemoteMasterShipEventHandler(), true); |
Yuta HIGUCHI | c8e19d4 | 2014-09-24 17:20:52 -0700 | [diff] [blame] | 69 | |
tom | b41d1ac | 2014-09-24 01:51:24 -0700 | [diff] [blame] | 70 | log.info("Started"); |
| 71 | } |
| 72 | |
| 73 | @Deactivate |
| 74 | public void deactivate() { |
| 75 | log.info("Stopped"); |
| 76 | } |
| 77 | |
| 78 | @Override |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 79 | public MastershipRole getRole(NodeId nodeId, DeviceId deviceId) { |
| 80 | byte[] did = serialize(deviceId); |
| 81 | byte[] nid = serialize(nodeId); |
| 82 | |
| 83 | NodeId current = deserialize(masters.get(did)); |
| 84 | if (current == null) { |
| 85 | if (standbys.containsEntry(did, nid)) { |
| 86 | //was previously standby, or set to standby from master |
| 87 | return MastershipRole.STANDBY; |
| 88 | } else { |
| 89 | return MastershipRole.NONE; |
| 90 | } |
| 91 | } else { |
| 92 | if (current.equals(nodeId)) { |
| 93 | //*should* be in unusable, not always |
| 94 | return MastershipRole.MASTER; |
| 95 | } else { |
| 96 | //may be in backups or unusable from earlier retirement |
| 97 | return MastershipRole.STANDBY; |
| 98 | } |
| 99 | } |
| 100 | } |
| 101 | |
| 102 | @Override |
Ayaka Koshibe | 406d010 | 2014-09-24 16:08:12 -0700 | [diff] [blame] | 103 | public MastershipEvent setMaster(NodeId nodeId, DeviceId deviceId) { |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 104 | byte [] did = serialize(deviceId); |
| 105 | byte [] nid = serialize(nodeId); |
tom | b41d1ac | 2014-09-24 01:51:24 -0700 | [diff] [blame] | 106 | |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 107 | ILock lock = theInstance.getLock(LOCK); |
| 108 | lock.lock(); |
| 109 | try { |
| 110 | MastershipRole role = getRole(nodeId, deviceId); |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 111 | switch (role) { |
| 112 | case MASTER: |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 113 | //reinforce mastership |
| 114 | evict(nid, did); |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 115 | return null; |
| 116 | case STANDBY: |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 117 | //make current master standby |
| 118 | byte [] current = masters.get(did); |
| 119 | if (current != null) { |
| 120 | backup(current, did); |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 121 | } |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 122 | //assign specified node as new master |
| 123 | masters.put(did, nid); |
| 124 | evict(nid, did); |
| 125 | updateTerm(did); |
| 126 | return new MastershipEvent(MASTER_CHANGED, deviceId, nodeId); |
| 127 | case NONE: |
| 128 | masters.put(did, nid); |
| 129 | evict(nid, did); |
| 130 | updateTerm(did); |
| 131 | return new MastershipEvent(MASTER_CHANGED, deviceId, nodeId); |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 132 | default: |
| 133 | log.warn("unknown Mastership Role {}", role); |
| 134 | return null; |
| 135 | } |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 136 | } finally { |
| 137 | lock.unlock(); |
tom | b41d1ac | 2014-09-24 01:51:24 -0700 | [diff] [blame] | 138 | } |
| 139 | } |
| 140 | |
| 141 | @Override |
| 142 | public NodeId getMaster(DeviceId deviceId) { |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 143 | return deserialize(masters.get(serialize(deviceId))); |
tom | b41d1ac | 2014-09-24 01:51:24 -0700 | [diff] [blame] | 144 | } |
| 145 | |
| 146 | @Override |
| 147 | public Set<DeviceId> getDevices(NodeId nodeId) { |
| 148 | ImmutableSet.Builder<DeviceId> builder = ImmutableSet.builder(); |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 149 | |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 150 | for (Map.Entry<byte[], byte[]> entry : masters.entrySet()) { |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 151 | if (nodeId.equals(deserialize(entry.getValue()))) { |
| 152 | builder.add((DeviceId) deserialize(entry.getKey())); |
tom | b41d1ac | 2014-09-24 01:51:24 -0700 | [diff] [blame] | 153 | } |
| 154 | } |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 155 | |
tom | b41d1ac | 2014-09-24 01:51:24 -0700 | [diff] [blame] | 156 | return builder.build(); |
| 157 | } |
| 158 | |
| 159 | @Override |
| 160 | public MastershipRole requestRole(DeviceId deviceId) { |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 161 | NodeId local = clusterService.getLocalNode().id(); |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 162 | byte [] did = serialize(deviceId); |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 163 | byte [] lnid = serialize(local); |
| 164 | |
| 165 | ILock lock = theInstance.getLock(LOCK); |
| 166 | lock.lock(); |
| 167 | try { |
| 168 | MastershipRole role = getRole(local, deviceId); |
| 169 | switch (role) { |
| 170 | case MASTER: |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 171 | evict(lnid, did); |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 172 | break; |
| 173 | case STANDBY: |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 174 | backup(lnid, did); |
| 175 | terms.putIfAbsent(did, INIT); |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 176 | break; |
| 177 | case NONE: |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 178 | //claim mastership |
| 179 | masters.put(did, lnid); |
| 180 | evict(lnid, did); |
| 181 | updateTerm(did); |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 182 | role = MastershipRole.MASTER; |
| 183 | break; |
| 184 | default: |
| 185 | log.warn("unknown Mastership Role {}", role); |
| 186 | } |
| 187 | return role; |
| 188 | } finally { |
| 189 | lock.unlock(); |
| 190 | } |
tom | b41d1ac | 2014-09-24 01:51:24 -0700 | [diff] [blame] | 191 | } |
| 192 | |
| 193 | @Override |
Ayaka Koshibe | b70d34b | 2014-09-25 15:43:01 -0700 | [diff] [blame] | 194 | public MastershipTerm getTermFor(DeviceId deviceId) { |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 195 | byte[] did = serialize(deviceId); |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 196 | if ((masters.get(did) == null) || |
| 197 | (terms.get(did) == null)) { |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 198 | return null; |
| 199 | } |
| 200 | return MastershipTerm.of( |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 201 | (NodeId) deserialize(masters.get(did)), terms.get(did)); |
Ayaka Koshibe | b70d34b | 2014-09-25 15:43:01 -0700 | [diff] [blame] | 202 | } |
| 203 | |
Ayaka Koshibe | d9f693e | 2014-09-29 18:04:54 -0700 | [diff] [blame] | 204 | @Override |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 205 | public MastershipEvent setStandby(NodeId nodeId, DeviceId deviceId) { |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 206 | byte [] did = serialize(deviceId); |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 207 | byte [] nid = serialize(nodeId); |
| 208 | MastershipEvent event = null; |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 209 | |
| 210 | ILock lock = theInstance.getLock(LOCK); |
| 211 | lock.lock(); |
| 212 | try { |
| 213 | MastershipRole role = getRole(nodeId, deviceId); |
| 214 | switch (role) { |
| 215 | case MASTER: |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 216 | event = reelect(nodeId, deviceId); |
| 217 | backup(nid, did); |
| 218 | break; |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 219 | case STANDBY: |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 220 | //fall through to reinforce role |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 221 | case NONE: |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 222 | backup(nid, did); |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 223 | break; |
| 224 | default: |
| 225 | log.warn("unknown Mastership Role {}", role); |
| 226 | } |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 227 | return event; |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 228 | } finally { |
| 229 | lock.unlock(); |
| 230 | } |
| 231 | } |
| 232 | |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 233 | @Override |
| 234 | public MastershipEvent relinquishRole(NodeId nodeId, DeviceId deviceId) { |
| 235 | byte [] did = serialize(deviceId); |
| 236 | byte [] nid = serialize(nodeId); |
| 237 | MastershipEvent event = null; |
Ayaka Koshibe | 25fd23a | 2014-10-03 15:50:43 -0700 | [diff] [blame] | 238 | |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 239 | ILock lock = theInstance.getLock(LOCK); |
| 240 | lock.lock(); |
| 241 | try { |
| 242 | MastershipRole role = getRole(nodeId, deviceId); |
| 243 | switch (role) { |
| 244 | case MASTER: |
| 245 | event = reelect(nodeId, deviceId); |
| 246 | evict(nid, did); |
| 247 | break; |
| 248 | case STANDBY: |
| 249 | //fall through to reinforce relinquishment |
| 250 | case NONE: |
| 251 | evict(nid, did); |
| 252 | break; |
| 253 | default: |
| 254 | log.warn("unknown Mastership Role {}", role); |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 255 | } |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 256 | return event; |
| 257 | } finally { |
| 258 | lock.unlock(); |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 259 | } |
Ayaka Koshibe | d9f693e | 2014-09-29 18:04:54 -0700 | [diff] [blame] | 260 | } |
| 261 | |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 262 | //helper to fetch a new master candidate for a given device. |
| 263 | private MastershipEvent reelect(NodeId current, DeviceId deviceId) { |
| 264 | byte [] did = serialize(deviceId); |
| 265 | byte [] nid = serialize(current); |
| 266 | |
| 267 | //if this is an queue it'd be neater. |
| 268 | byte [] backup = null; |
| 269 | for (byte [] n : standbys.get(serialize(deviceId))) { |
| 270 | if (!current.equals(deserialize(n))) { |
| 271 | backup = n; |
| 272 | break; |
| 273 | } |
| 274 | } |
| 275 | |
| 276 | if (backup == null) { |
| 277 | masters.remove(did, nid); |
| 278 | return null; |
| 279 | } else { |
| 280 | masters.put(did, backup); |
| 281 | evict(backup, did); |
| 282 | Integer term = terms.get(did); |
| 283 | terms.put(did, ++term); |
| 284 | return new MastershipEvent( |
| 285 | MASTER_CHANGED, deviceId, (NodeId) deserialize(backup)); |
| 286 | } |
| 287 | } |
| 288 | |
| 289 | //adds node to pool(s) of backups and moves them from unusable. |
| 290 | private void backup(byte [] nodeId, byte [] deviceId) { |
| 291 | if (!standbys.containsEntry(deviceId, nodeId)) { |
| 292 | standbys.put(deviceId, nodeId); |
| 293 | } |
| 294 | if (unusable.containsEntry(deviceId, nodeId)) { |
| 295 | unusable.remove(deviceId, nodeId); |
| 296 | } |
| 297 | } |
| 298 | |
| 299 | //adds node to unusable and evicts it from backup pool. |
| 300 | private void evict(byte [] nodeId, byte [] deviceId) { |
| 301 | if (!unusable.containsEntry(deviceId, nodeId)) { |
| 302 | unusable.put(deviceId, nodeId); |
| 303 | } |
| 304 | if (standbys.containsEntry(deviceId, nodeId)) { |
| 305 | standbys.remove(deviceId, nodeId); |
| 306 | } |
| 307 | } |
| 308 | |
| 309 | //adds or updates term information. |
| 310 | private void updateTerm(byte [] deviceId) { |
| 311 | Integer term = terms.get(deviceId); |
| 312 | if (term == null) { |
| 313 | terms.put(deviceId, INIT); |
| 314 | } else { |
| 315 | terms.put(deviceId, ++term); |
| 316 | } |
Ayaka Koshibe | 8583ff3 | 2014-10-02 16:25:30 -0700 | [diff] [blame] | 317 | } |
| 318 | |
Ayaka Koshibe | 5c0f237 | 2014-10-02 17:59:04 -0700 | [diff] [blame] | 319 | private class RemoteMasterShipEventHandler extends RemoteEventHandler<DeviceId, NodeId> { |
alshabib | 339a3d9 | 2014-09-26 17:54:32 -0700 | [diff] [blame] | 320 | |
| 321 | @Override |
| 322 | protected void onAdd(DeviceId deviceId, NodeId nodeId) { |
| 323 | notifyDelegate(new MastershipEvent(MASTER_CHANGED, deviceId, nodeId)); |
| 324 | } |
| 325 | |
| 326 | @Override |
| 327 | protected void onRemove(DeviceId deviceId, NodeId nodeId) { |
Ayaka Koshibe | 5c0f237 | 2014-10-02 17:59:04 -0700 | [diff] [blame] | 328 | //notifyDelegate(new MastershipEvent(MASTER_CHANGED, deviceId, nodeId)); |
alshabib | 339a3d9 | 2014-09-26 17:54:32 -0700 | [diff] [blame] | 329 | } |
| 330 | |
| 331 | @Override |
| 332 | protected void onUpdate(DeviceId deviceId, NodeId oldNodeId, NodeId nodeId) { |
Ayaka Koshibe | c404770 | 2014-10-07 14:43:52 -0700 | [diff] [blame] | 333 | //only addition indicates a change in mastership |
Ayaka Koshibe | 5c0f237 | 2014-10-02 17:59:04 -0700 | [diff] [blame] | 334 | //notifyDelegate(new MastershipEvent(MASTER_CHANGED, deviceId, nodeId)); |
alshabib | 339a3d9 | 2014-09-26 17:54:32 -0700 | [diff] [blame] | 335 | } |
| 336 | } |
| 337 | |
tom | b41d1ac | 2014-09-24 01:51:24 -0700 | [diff] [blame] | 338 | } |