This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/epu/provisioner/leader.py b/epu/provisioner/leader.py | |
index c1808f8..ad59b00 100644 | |
--- a/epu/provisioner/leader.py | |
+++ b/epu/provisioner/leader.py | |
@@ -139,16 +139,16 @@ class ProvisionerLeader(object): | |
self.core.terminate_all() | |
if self.terminator_thread is None: | |
- self.terminator_thread = tevent.spawn(self.run_terminator, fail_fast=True) | |
+ self.terminator_thread = tevent.spawn(self.run_terminator, _fail_fast=True) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/usr/bin/env python | |
import os | |
import sys | |
import base64 | |
import boto | |
from boto.ec2.regioninfo import RegionInfo | |
import urllib2 | |
def pgm_help(): |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
startDatagram ================================= | |
datagramSourceIP 127.0.0.1 | |
datagramSize 240 | |
unixSecondsUTC 1347925287 | |
datagramVersion 5 | |
agentSubId 100000 | |
agent 192.168.4.102 | |
packetSequenceNo 7 | |
sysUpTime 73000 | |
samplesInPacket 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/objects/data/cei/process.yml b/objects/data/cei/process.yml | |
index 9e2afbb..3bea514 100644 | |
--- a/objects/data/cei/process.yml | |
+++ b/objects/data/cei/process.yml | |
@@ -30,13 +30,15 @@ Process: !Extends_TaskableResource | |
# Describes request scheduling a process on specific resources | |
ProcessTarget: | |
execution_engine_id: "" | |
- execution_engine_group: "" | |
+ node_exclusive: "" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
type: release | |
name: cei_deploy | |
version: 0.1 | |
description: Common Execution Infrastructure Services | |
ion: 0.0.1 | |
apps: | |
# dependencies | |
- name: bootstrapper1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- a/pyon/util/sflow.py | |
+++ b/pyon/util/sflow.py | |
@@ -90,7 +90,7 @@ class SFlowManager(object): | |
res = resource.getrusage(resource.RUSAGE_SELF) | |
# build and send counter structure | |
- csample = { 'counters_sample': { | |
+ csample = { 'counter_sample': { | |
'app_name': str(self._container.id), | |
'app_resources': { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
startDatagram ================================= | |
datagramSourceIP 127.0.0.1 | |
datagramSize 428 | |
unixSecondsUTC 1343154826 | |
datagramVersion 5 | |
agentSubId 100000 | |
agent 10.28.212.105 | |
packetSequenceNo 3 | |
sysUpTime 64000 | |
samplesInPacket 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: src/Linux/Makefile | |
=================================================================== | |
--- src/Linux/Makefile (revision 317) | |
+++ src/Linux/Makefile (working copy) | |
@@ -15,10 +15,6 @@ | |
ifeq ($(JSON),) | |
JSON=yes | |
endif | |
-ifeq ($(JSON),yes) | |
- CFLAGS+=-DHSF_JSON |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: src/Linux/Makefile | |
=================================================================== | |
--- src/Linux/Makefile (revision 317) | |
+++ src/Linux/Makefile (working copy) | |
@@ -119,7 +119,7 @@ | |
SFLOWOVS_OBJS=sflowovsd.o util.o | |
CFLAGS+= -I. -I$(SFLOWDIR) -I$(JSONDIR) $(OPT) -Wall -D_GNU_SOURCE -DHSP_VERSION=$(VERSION) -DUTHEAP | |
-LIBS+= $(SFLOWDIR)/libsflow.a $(JSONDIR)/libjson.a -lresolv -lpthread | |
+LIBS+= $(SFLOWDIR)/libsflow.a $(JSONDIR)/libjson.a -lresolv -lpthread -lm |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ubuntu@ip-10-29-159-207:/tmp/host-sflow$ make | |
cd src/sflow; make | |
make[1]: Entering directory `/tmp/host-sflow/src/sflow' | |
gcc -D_GNU_SOURCE -DSTDC_HEADERS -O3 -DNDEBUG -Wall -Wcast-align -I. -c sflow_agent.c | |
gcc -D_GNU_SOURCE -DSTDC_HEADERS -O3 -DNDEBUG -Wall -Wcast-align -I. -c sflow_sampler.c | |
gcc -D_GNU_SOURCE -DSTDC_HEADERS -O3 -DNDEBUG -Wall -Wcast-align -I. -c sflow_poller.c | |
gcc -D_GNU_SOURCE -DSTDC_HEADERS -O3 -DNDEBUG -Wall -Wcast-align -I. -c sflow_receiver.c | |
ar cru libsflow.a sflow_agent.o sflow_sampler.o sflow_poller.o sflow_receiver.o | |
ranlib libsflow.a | |
make[1]: Leaving directory `/tmp/host-sflow/src/sflow' |