hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject incubator-hawq git commit: HAWQ-90. Fixed gpmigrator crash caused by pg_resqueue table definition change(HAWQ-25 and HAWQ-83)
Date Wed, 28 Oct 2015 03:13:57 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 83854f932 -> fc05875e0


HAWQ-90. Fixed gpmigrator crash caused by pg_resqueue table definition change(HAWQ-25 and
HAWQ-83)


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/fc05875e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/fc05875e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/fc05875e

Branch: refs/heads/master
Commit: fc05875e0536142f39001a74d69b7a533c4b6dfb
Parents: 83854f9
Author: Ming LI <mli@pivotal.io>
Authored: Wed Oct 28 10:47:02 2015 +0800
Committer: Ming LI <mli@pivotal.io>
Committed: Wed Oct 28 11:07:02 2015 +0800

----------------------------------------------------------------------
 .../regress/data/upgrade20/pg_resqueue.data     |  4 +--
 .../data/upgrade20/upg2_catupgrade_20.sql.in    | 27 +++++++++++---------
 tools/bin/gpmigrator                            |  2 +-
 3 files changed, 18 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/fc05875e/src/test/regress/data/upgrade20/pg_resqueue.data
----------------------------------------------------------------------
diff --git a/src/test/regress/data/upgrade20/pg_resqueue.data b/src/test/regress/data/upgrade20/pg_resqueue.data
index b05bed0..93acc76 100644
--- a/src/test/regress/data/upgrade20/pg_resqueue.data
+++ b/src/test/regress/data/upgrade20/pg_resqueue.data
@@ -1,2 +1,2 @@
-9800,pg_root,0,-1,100%,100%,2,even,,,,,branch
-6055,pg_default,9800,100,50%,50%,2,even,mem:128mb,,,,
+9800,pg_root,0,-1,100%,100%,2,even,,0,0,0,1,,,branch
+6055,pg_default,9800,100,50%,50%,2,even,mem:128mb,0,0,0,1,,,

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/fc05875e/src/test/regress/data/upgrade20/upg2_catupgrade_20.sql.in
----------------------------------------------------------------------
diff --git a/src/test/regress/data/upgrade20/upg2_catupgrade_20.sql.in b/src/test/regress/data/upgrade20/upg2_catupgrade_20.sql.in
index 74d5ffe..2bd4496 100644
--- a/src/test/regress/data/upgrade20/upg2_catupgrade_20.sql.in
+++ b/src/test/regress/data/upgrade20/upg2_catupgrade_20.sql.in
@@ -74,18 +74,21 @@ DELETE FROM pg_type where typname='pg_resqueue';
 set gp_before_persistence_work to false;
 CREATE TABLE pg_resqueue
 (
-    rsqname name not null, -- name of resource queue
-    rsq_parent oid not null, -- oid of resource queue
-    rsq_active_stats_cluster integer not null, -- active statement count limit
-    rsq_memory_limit_cluster text, -- memory limit in cluster
-    rsq_core_limit_cluster text, -- core limit in cluster
-    rsq_resource_upper_factor real, -- resource upper limit in cluster
-    rsq_allocation_policy text, -- query resource allocation policy
-    rsq_vseg_resource_quota text, -- vsegment resource quota
-    rsq_vseg_upper_limit integer, -- vsegment size upper limit
-    rsq_creation_time timestamp with time zone, -- when the queue is created
-    rsq_update_time timestamp with time zone, -- when the queue is updated ( create or alter
)
-    rsq_status text -- the status of resource queue.
+  name name, -- name of resource queue
+  parentoid oid, -- oid of resource queue
+  activestats integer, -- active statement count limit
+  memorylimit text, -- memory limit in cluster
+  corelimit text, -- core limit in cluster
+  resovercommit real, -- resource upper limit in cluster
+  allocpolicy text, -- query resource allocation policy
+  vsegresourcequota text, -- vsegment resource quota
+  nvsegupperlimit integer, -- vsegment size upper limit
+  nvseglowerlimit integer, -- vsegment size lower limit
+  nvsegupperlimitperseg real, -- vsegment size upper limit per segment
+  nvseglowerlimitperseg real, -- vsegment size lower limit per segment
+  creationtime timestamp with time zone, -- when the queue is created
+  updatetime timestamp with time zone, -- when the queue is updated ( create or alter  )
+  status text -- the status of resource queue
 )
 with (camelcase=ResQueue, shared=true, oids=true, relid=6026, reltype_oid=9830, toast_oid=9820,
toast_index=9821, toast_reltype=9822)
 TABLESPACE pg_global;

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/fc05875e/tools/bin/gpmigrator
----------------------------------------------------------------------
diff --git a/tools/bin/gpmigrator b/tools/bin/gpmigrator
index 98a3b3f..1de4d5b 100755
--- a/tools/bin/gpmigrator
+++ b/tools/bin/gpmigrator
@@ -1697,7 +1697,7 @@ class GPUpgrade(GPUpgradeBase):
             self.update_xml_content(file_cont, 'hawq_segment_directory', self.array.segments[0].primaryDB.datadir)
 
         # yarn related is set to default value: yarn disabled
-        self.update_xml_content(file_cont, 'hawq_resourcemanager_server_type', 'none')
+        self.update_xml_content(file_cont, 'hawq_global_rm_type', 'none')
         self.update_xml_content(file_cont, 'hawq_resourcemanager_yarn_resourcemanager_address',
'localhost:9980')
         self.update_xml_content(file_cont, 'hawq_resourcemanager_yarn_resourcemanager_scheduler_address',
'localhost:9981')
 


Mime
View raw message