Clone
 

gonzalo correa <gonzalo.correa@hp.com> in Trafodion

Merge branch 'traf/traf-config' into traf/elasticity-deliver

Conflicts:

core/sqf/sql/scripts/bats/sqconfig.tm

core/sqf/sql/scripts/dbcheck

core/sqf/src/seabed/test/xconfigdb

sqf/monitor/linux/makefile

sqf/monitor/linux/pstartd.cxx

sqf/monitor/linux/watchdog.cxx

    • -7
    • +28
    /core/sqf/export/include/seabed/ms.h
    • -33
    • +52
    /core/sqf/monitor/linux/clio.cxx
    • -3
    • +167
    /core/sqf/monitor/linux/cluster.cxx
    • -499
    • +1208
    /core/sqf/monitor/linux/clusterconf.cxx
    • -62
    • +108
    /core/sqf/monitor/linux/clusterconf.h
    • -272
    • +8
    /core/sqf/monitor/linux/config.cxx
  1. … 182 more files in changeset.
Removed script file.

Change-Id: I18975759135321aaa03488f8c9acd17459c22774

Added missing sample configuration file.

Change-Id: I2929c4777408c6b3c0894c90f3b2b9d42f13de4c

    • -0
    • +74
    /sqf/sql/scripts/sqconfig.p2n2
Deleted unwanted characters.

Change-Id: Ief288883b972d64f6e390e904ae83748a4c54886

Updated copyright.

Change-Id: I92f103a762f80e7c725a5c9d18e87e90fd522691

Elasticity changes missing files

Change-Id: I80863c2bdffaa382bcbbac0ccab4ad08b03320e0

    • -0
    • +194
    /sqf/monitor/linux/reqnodeadd.cxx
    • -0
    • +171
    /sqf/monitor/linux/reqnodedelete.cxx
Trafodion Elasticity changes.

Change-Id: I1684d2bf949fdd5aae815dddb193a15a63fd1f1a

    • -1
    • +16
    /sqf/export/include/common/evl_sqlog_eventnum.h
    • -149
    • +596
    /sqf/monitor/linux/clusterconf.cxx
    • -11
    • +24
    /sqf/monitor/linux/lnodeconfig.h
  1. … 19 more files in changeset.
More fixes to CClusterConfig

Change-Id: I39d98eefb67296f4b90bfcd2e1dce6d5d5a5660a

Merge branch 'master' into traf/opensrc

Merge remote branch 'gerrit/master' into traf/opensrc

More fixes to shell.

Change-Id: I8451fe6d1cb31a3f83e0e42cb546968946d0e372

Monitor unit test fixes.

Change-Id: Ic8bf4247e88693553fa2c5779e3ff45317f45585

    • -1
    • +52
    /sqf/sql/scripts/bats/sqconfig.monitor
    • -1
    • +52
    /sqf/sql/scripts/bats/sqconfig.seabed
Merge conflix fix.

Change-Id: I1ae99ae46d950662d1eed537317bbd5602309fdd

Merge branch 'master' of /archive/gcorrea/traf-config

Conflicts:

sqf/monitor/linux/clusterconf.cxx

Change-Id: I79e9c86b680b3a50a12cc59731ccfcc2094fe771

Added 'persist config/exec/info' commands.

Change-Id: I07e7afe5bb9b4e8d302d93384630149829df761a

    • -118
    • +124
    /sqf/monitor/linux/clusterconf.cxx
    • -45
    • +16
    /sqf/monitor/linux/persistconfig.cxx
    • -26
    • +16
    /sqf/monitor/linux/persistconfig.h
    • -2699
    • +3542
    /sqf/monitor/linux/shell.cxx
Code cleanup and process info pattern enabled

Change-Id: I30639358d5c30e02567f5a74ce7078cb2b08d433

    • -11
    • +44
    /sqf/monitor/linux/reqprocinfo.cxx
Merge branch 'master' into traf/traf-config

Conflicts:

sqf/monitor/linux/msgdef.h

Change-Id: I869feff9fb564a59196bbc3e3e56eea56431c72e

Added process info pattern

Merge branch 'master' into traf/traf-config

Conflicts:

sqf/monitor/linux/msgdef.h

Change-Id: Ib0387f04cefe26e49f36ed140f7ea6e05729ede8

Preliminary CClusterConfig changes

Change-Id: I8f61c7013e8553167bc08fd4d3d628d8f870d8b7

    • -0
    • +11
    /sqf/export/include/common/evl_sqlog_eventnum.h
    • -8
    • +437
    /sqf/monitor/linux/clusterconf.cxx
    • -0
    • +317
    /sqf/monitor/linux/persistconfig.cxx
    • -0
    • +167
    /sqf/monitor/linux/persistconfig.h
    • -18
    • +118
    /sqf/monitor/linux/testconf.cxx
Merge branch 'master' into traf/traf-config

Merge branch 'master' into traf/traf-config

Merge branch 'master' into traf/traf-config

Merge branch 'master' into traf/opensrc

Merge remote branch 'gerrit/master' into traf/traf-config

Removed 'cluster.conf', added node conf in SQLite

    • -580
    • +400
    /sqf/monitor/linux/clusterconf.cxx
    • -58
    • +45
    /sqf/monitor/linux/clusterconf.h
Closes-Bug: 1438340

Fixes 'sqnodeipcrm' errors reported during sqstart.

Change-Id: Ie3172fea38382c1e643e5a6f14e8ec7233cb3c3a

Temporary deletion on shared repo.

Code review changes.

Change-Id: Ifc480f0e64a00bb96cb4ce657e5e391d56c793f0

Squashed commit of the following:

DTM Persistent Process preliminary (disabled)

commit 52dc8676da21b7b33c24370b182f24bcbf8a804e

Merge: d691b6f 0fd7cab

Author: Gonzalo Correa <gonzalo.correa@hp.com>

Date: Mon Mar 23 14:08:03 2015 -0700

Merge remote branch 'gerrit/master' into traf/persist-dtm

commit d691b6fb5ba72d26c71bdff076c57fc965fe2fcb

Author: Gonzalo Correa <gonzalo.correa@hp.com>

Date: Mon Mar 23 14:02:23 2015 -0700

Pre-merge changes.

commit 51148aa3372c380d740b5cf4610a46a8a465e69b

Merge: 1e8924e d1c1419

Author: Gonzalo Correa <gonzalo.correa@hp.com>

Date: Mon Mar 23 12:55:50 2015 -0700

Merge branch 'master' into traf/opensrc

commit d1c1419daf36228a8ebbaca41e206d016914de57

Author: Gonzalo Correa <gonzalo.correa@hp.com>

Date: Mon Mar 23 11:38:30 2015 -0700

Disabled DTM persistence - preparing to check-in.

commit 35be8c3887779f02cf7b36322447ce02d6ba865c

Author: Gonzalo Correa <gonzalo.correa@hp.com>

Date: Mon Mar 23 08:32:37 2015 -0700

Updated copyright on changed files.

commit a5b2c821739216d68e1e4d192cb3c90576383196

Author: Gonzalo Correa <gonzalo.correa@hp.com>

Date: Sun Mar 22 12:35:23 2015 -0700

Fixes on shutdown when DTM is persistent process.

commit 29d7435be161bdb933207a04e434027d3bac96a4

Author: Gonzalo Correa <gonzalo.correa@hp.com>

Date: Fri Mar 20 18:55:47 2015 -0700

Fix TmReady logic when not persistent DTM.

commit b1313c56766b27bcfd3c3e947be175d014f8dbf5

Merge: 10376b7 ddab807

Author: Gonzalo Correa <gonzalo.correa@hp.com>

Date: Fri Mar 20 11:48:17 2015 -0700

Merge branch 'master' of /archive/gcorrea/traf-persist-dtm

commit 10376b78b1702f8b12aceebd27843070974d789e

Author: Gonzalo Correa <gonzalo.correa@hp.com>

Date: Fri Mar 20 11:47:10 2015 -0700

Added env var SQ_DTM_PERSISTENT_PROCESS

commit ddab8076d2e87ba0790dfa28c28aad38241a8ddd

Author: ron cassou <ron.cassou@hp.com>

Date: Fri Mar 20 18:35:44 2015 +0000

TM changes to support persistent TMs

commit c3d545c2e40863d9c72ac0806f125658e5d6cc67

Author: Gonzalo Correa <gonzalo.correa@hp.com>

Date: Thu Mar 19 18:59:36 2015 -0700

Monitor DTM persistent process changes.

commit 4294f57ee73f8abe5b3cb6da55ad35d4b388b3df

Author: Gonzalo Correa <gonzalo.correa@hp.com>

Date: Thu Mar 19 18:58:04 2015 -0700

Monitor DTM persisten process changes.

commit 9dd0bf30bf340ed9a8a22799872073055e12a613

Author: ron cassou <ron.cassou@hp.com>

Date: Tue Mar 10 23:23:50 2015 +0000

Don't bring the node down on dtm death

commit 7923f8f367b45f62bdb771653ae2822bea2fe88e

Author: Gonzalo Correa <gonzalo.correa@hp.com>

Date: Tue Mar 3 09:12:22 2015 -0800

Temporary share report delete.

Change-Id: I5c8416e6f2ed925182e59be7f2ad3caa70e6f554

    • -27
    • +275
    /sqf/monitor/linux/cluster.cxx
    • -12
    • +166
    /sqf/monitor/linux/process.cxx
  1. … 20 more files in changeset.