You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by wl...@apache.org on 2015/11/24 10:41:01 UTC
incubator-hawq git commit: HAWQ-187. Remove useless files from
resourcemanager
Repository: incubator-hawq
Updated Branches:
refs/heads/master c40dad63d -> fb46dd8b8
HAWQ-187. Remove useless files from resourcemanager
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/fb46dd8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/fb46dd8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/fb46dd8b
Branch: refs/heads/master
Commit: fb46dd8b8b6cfaffe26b4dd71dbce56b6bdf834b
Parents: c40dad6
Author: Wen Lin <wl...@pivotal.io>
Authored: Tue Nov 24 17:47:41 2015 +0800
Committer: Wen Lin <wl...@pivotal.io>
Committed: Tue Nov 24 17:47:41 2015 +0800
----------------------------------------------------------------------
src/backend/resourcemanager/makefile_internal | 46 ------------
src/backend/resourcemanager/output | 84 ----------------------
2 files changed, 130 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/fb46dd8b/src/backend/resourcemanager/makefile_internal
----------------------------------------------------------------------
diff --git a/src/backend/resourcemanager/makefile_internal b/src/backend/resourcemanager/makefile_internal
deleted file mode 100644
index 244272f..0000000
--- a/src/backend/resourcemanager/makefile_internal
+++ /dev/null
@@ -1,46 +0,0 @@
-CC = g++
-OPTS = -g -std=gnu++0x -lc -lpthread
-INCYARN = -I libyarn/include
-LIBYARN = -L libyarn/lib -lyarn
-#INCBOOST = -I /opt/boost/include
-#LIBBOOST = -L /opt/boost/lib -lboost
-INCRPOTOBUFC = -I protobuf/include
-LIBPROTOBUFC = -L protobuf/lib -lprotobuf-c
-
-INCLUDES = $(INCYARN) $(INCPROTOBUFC) -I ./include
-LIBS = $(LIBYARN) $(LIBPROTOBUFC)
-
-MAINOBJS = main.o dynrm.o envswitch.o nodemanager.o resqueuemanager.o
-UTILOBJS = balancedbst.o linkedlist.o
-TESTOBJS = yarnsimulator.o
-
-all:hawqdrm
-
-hawqdrm:$(MAINOBJS) $(UTILOBJS) $(TESTOBJS)
- $(CC) $(OPTS) $(LIBYARN) $(LIBPROTOBUFC) $(MAINOBJS) $(UTILOBJS) $(TESTOBJS) -o hawqdrm
-main.o:main.c
- $(CC) $(OPTS) $(INCLUDES) -c main.c
-dynrm.o:dynrm.c include/dynrm.h
- $(CC) $(OPTS) $(INCLUDES) -c dynrm.c
-
-envswitch.o:envswitch.c include/envswitch.h
- $(CC) $(OPTS) $(INCLUDES) -c envswitch.c -o envswitch.o
-
-nodemanager.o:nodemanager.c include/dynrm.h
- $(CC) $(OPTS) $(INCLUDES) -c nodemanager.c -o nodemanager.o
-
-resqueuemanager.o:resqueuemanager.c include/dynrm.h
- $(CC) $(OPTS) $(INCLUDES) -c resqueuemanager.c -o resqueuemanager.o
-
-linkedlist.o:utils/linkedlist.c include/utils/linkedlist.h
- $(CC) $(OPTS) $(INCLUDES) -c utils/linkedlist.c -o linkedlist.o
-
-balancedbst.o:utils/balancedbst.c include/utils/balancedbst.h
- $(CC) $(OPTS) $(INCLUDES) -c utils/balancedbst.c -o balancedbst.o
-
-yarnsimulator.o:test/yarnsimulator/yarnsimulator.c include/test/yarnsimulator.h
- $(CC) $(OPTS) $(INCLUDES) -c test/yarnsimulator/yarnsimulator.c -o yarnsimulator.o
-
-clean:
- rm *.o
- rm hawqdrm
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/fb46dd8b/src/backend/resourcemanager/output
----------------------------------------------------------------------
diff --git a/src/backend/resourcemanager/output b/src/backend/resourcemanager/output
deleted file mode 100644
index 21d5d47..0000000
--- a/src/backend/resourcemanager/output
+++ /dev/null
@@ -1,84 +0,0 @@
-NOTE: Accepted command line: -test test/cluster.conf
-NOTE: Open simulator configure file test/cluster.conf
-NOTE: Load configure line: [[TEST.SIMULATOR.CLUSTER.NODEIPPREFIX.1=192.168.3.%]]
-NOTE: Accepted configure command:TEST.SIMULATOR.CLUSTER.NODEIPPREFIX.1==192.168.3.%
-NOTE: Add new cluster , address as =192.168.3.%
-NOTE: Load configure line: [[TEST.SIMULATOR.CLUSTER.NODEIPPREFIX.2=192.168.4.%]]
-NOTE: Accepted configure command:TEST.SIMULATOR.CLUSTER.NODEIPPREFIX.2==192.168.4.%
-NOTE: Add new cluster , address as =192.168.4.%
-NOTE: Load configure line: [[TEST.SIMULATOR.CLUSTER.NODEIPPREFIX.3=192.168.5.%]]
-NOTE: Accepted configure command:TEST.SIMULATOR.CLUSTER.NODEIPPREFIX.3==192.168.5.%
-NOTE: Add new cluster , address as =192.168.5.%
-NOTE: Load configure line: [[TEST.SIMULATOR.CLUSTER.NODEIPPREFIX.4=192.168.6.%]]
-NOTE: Accepted configure command:TEST.SIMULATOR.CLUSTER.NODEIPPREFIX.4==192.168.6.%
-NOTE: Add new cluster , address as =192.168.6.%
-NOTE: Load configure line: [[TEST.SIMULATOR.CLUSTER.NODEIPCOUNTER.1=2..251]]
-NOTE: Accepted configure command:TEST.SIMULATOR.CLUSTER.NODEIPCOUNTER.1==2..251
-NOTE: Set cluster , address counter as =2..251
-NOTE: Load configure line: [[TEST.SIMULATOR.CLUSTER.NODEIPCOUNTER.2=2..251]]
-NOTE: Accepted configure command:TEST.SIMULATOR.CLUSTER.NODEIPCOUNTER.2==2..251
-NOTE: Set cluster , address counter as =2..251
-NOTE: Load configure line: [[TEST.SIMULATOR.CLUSTER.NODEIPCOUNTER.3=2..251]]
-NOTE: Accepted configure command:TEST.SIMULATOR.CLUSTER.NODEIPCOUNTER.3==2..251
-NOTE: Set cluster , address counter as =2..251
-NOTE: Load configure line: [[TEST.SIMULATOR.CLUSTER.NODEIPCOUNTER.4=2..251]]
-NOTE: Accepted configure command:TEST.SIMULATOR.CLUSTER.NODEIPCOUNTER.4==2..251
-NOTE: Set cluster , address counter as =2..251
-NOTE: Load configure line: [[TEST.SIMULATOR.CLUSTER.NODEMEMGB=64]]
-NOTE: Accepted configure command:TEST.SIMULATOR.CLUSTER.NODEMEMGB==64
-NOTE: Set node memory capacity =64 GB
-NOTE: Load configure line: [[TEST.SIMULATOR.CLUSTER.NODECORE=16]]
-NOTE: Accepted configure command:TEST.SIMULATOR.CLUSTER.NODECORE==16
-NOTE: Set node core capacity =16
-0..-1 *********************0..-1 *********************0..-1 *********************0..-1 *********************RESQUEUE:ID=1,Name=samplequeue,MAX(MEM=1024000MB,CORE=100),IDLE(MEM=204800MB),RATIO=10240MBperCore.
-ALLOC(MEM=0MB),EXPECT(MEM=0MB),USED(MEM=0MB),NODES=0.
-RESQUEUE:ID=2,Name=samplequeue2,MAX(MEM=512000MB,CORE=50),IDLE(MEM=20480MB),RATIO=10240MBperCore.
-ALLOC(MEM=0MB),EXPECT(MEM=0MB),USED(MEM=0MB),NODES=0.
-RESQUEUE:ID=3,Name=hpqueue,MAX(MEM=1024000MB,CORE=1000),IDLE(MEM=1024000MB),RATIO=1024MBperCore.
-ALLOC(MEM=0MB),EXPECT(MEM=0MB),USED(MEM=0MB),NODES=0.
-Recognized node information:192.168.3.1:5432
-
-HAWQ NODE:ID=0,HOST=(null),ADDR=192.168.3.1,PORT=5432
-,HAWQAVAIL=1,YARNAVAIL=1.
-Recognized node information:192.168.3.2:5432
-
-HAWQ NODE:ID=1,HOST=(null),ADDR=192.168.3.2,PORT=5432
-,HAWQAVAIL=1,YARNAVAIL=1.
-Recognized node information:192.168.3.3:5432
-
-HAWQ NODE:ID=2,HOST=(null),ADDR=192.168.3.3,PORT=5432
-,HAWQAVAIL=1,YARNAVAIL=1.
-Recognized node information:192.168.3.4:5432
-
-HAWQ NODE:ID=3,HOST=(null),ADDR=192.168.3.4,PORT=5432
-,HAWQAVAIL=1,YARNAVAIL=1.
-Recognized node information:192.168.3.5:5432
-
-HAWQ NODE:ID=4,HOST=(null),ADDR=192.168.3.5,PORT=5432
-,HAWQAVAIL=1,YARNAVAIL=1.
-Recognized node information:192.168.3.6:5432
-
-HAWQ NODE:ID=5,HOST=(null),ADDR=192.168.3.6,PORT=5432
-,HAWQAVAIL=1,YARNAVAIL=1.
-Recognized node information:192.168.3.7:5432
-
-HAWQ NODE:ID=6,HOST=(null),ADDR=192.168.3.7,PORT=5432
-,HAWQAVAIL=1,YARNAVAIL=1.
-Recognized node information:192.168.3.8:5432
-
-HAWQ NODE:ID=7,HOST=(null),ADDR=192.168.3.8,PORT=5432
-,HAWQAVAIL=1,YARNAVAIL=1.
-Recognized node information:192.168.3.9:5432
-
-HAWQ NODE:ID=8,HOST=(null),ADDR=192.168.3.9,PORT=5432
-,HAWQAVAIL=1,YARNAVAIL=1.
-Recognized node information:192.168.3.10:5432
-
-HAWQ NODE:ID=9,HOST=(null),ADDR=192.168.3.10,PORT=5432
-,HAWQAVAIL=1,YARNAVAIL=1.
-Totally, recognized 10 HAWQ node(s).
-QUEUE[0], request (10240 MB, 1 Core)* (20, Min=1)
-QUEUE[1], request (10240 MB, 1 Core)* (2, Min=1)
-QUEUE[2], request (1024 MB, 1 Core)* (1000, Min=1)
-RATIO[1024], request (1024 MB, 1 Core)* (1000, Min=1)
-RATIO[10240], request (20480 MB, 2 Core)* (22, Min=2)