Updated Branches: refs/heads/master 04d127eea -> dc8acc0e3
Fixed an issue with the way queries and shards are being collected now Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/dc8acc0e Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/dc8acc0e Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/dc8acc0e Branch: refs/heads/master Commit: dc8acc0e31418ded404ccc651bbfc1e284874f36 Parents: 04d127e Author: Chris Rohr <[email protected]> Authored: Wed Sep 4 09:06:48 2013 -0400 Committer: Chris Rohr <[email protected]> Committed: Wed Sep 4 09:06:48 2013 -0400 ---------------------------------------------------------------------- ...4130250_increase_size_of_query_times_json.rb | 9 +++++++++ contrib/blur-console/blur-admin/db/schema.rb | 21 ++------------------ .../collectors/zookeeper/ShardCollector.java | 4 ++-- 3 files changed, 13 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/dc8acc0e/contrib/blur-console/blur-admin/db/migrate/20130904130250_increase_size_of_query_times_json.rb ---------------------------------------------------------------------- diff --git a/contrib/blur-console/blur-admin/db/migrate/20130904130250_increase_size_of_query_times_json.rb b/contrib/blur-console/blur-admin/db/migrate/20130904130250_increase_size_of_query_times_json.rb new file mode 100644 index 0000000..5658ed1 --- /dev/null +++ b/contrib/blur-console/blur-admin/db/migrate/20130904130250_increase_size_of_query_times_json.rb @@ -0,0 +1,9 @@ +class IncreaseSizeOfQueryTimesJson < ActiveRecord::Migration + def up + change_column :blur_queries, :times, :text + end + + def down + change_column :blur_queries, :times, :string + end +end http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/dc8acc0e/contrib/blur-console/blur-admin/db/schema.rb ---------------------------------------------------------------------- diff --git a/contrib/blur-console/blur-admin/db/schema.rb b/contrib/blur-console/blur-admin/db/schema.rb index 1f965ff..2051fa7 100644 --- a/contrib/blur-console/blur-admin/db/schema.rb +++ b/contrib/blur-console/blur-admin/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20130829031155) do +ActiveRecord::Schema.define(:version => 20130904130250) do create_table "admin_settings", :force => true do |t| t.string "setting", :null => false @@ -57,7 +57,7 @@ ActiveRecord::Schema.define(:version => 20130829031155) do t.text "selector_columns" t.string "userid" t.integer "blur_table_id" - t.string "times" + t.text "times" t.integer "total_shards" t.integer "state" t.boolean "record_only" @@ -159,23 +159,6 @@ ActiveRecord::Schema.define(:version => 20130829031155) do add_index "searches", ["blur_table_id"], :name => "index_searches_on_blur_table_id" add_index "searches", ["user_id"], :name => "index_searches_on_user_id" - create_table "system_metrics", :force => true do |t| - t.string "name", :null => false - t.datetime "started_at", :null => false - t.string "transaction_id" - t.text "payload" - t.float "duration", :null => false - t.float "exclusive_duration", :null => false - t.integer "request_id" - t.integer "parent_id" - t.string "action", :null => false - t.string "category", :null => false - end - - add_index "system_metrics", ["parent_id"], :name => "index_system_metrics_on_parent_id" - add_index "system_metrics", ["request_id"], :name => "index_system_metrics_on_request_id" - add_index "system_metrics", ["transaction_id"], :name => "index_system_metrics_on_transaction_id" - create_table "users", :force => true do |t| t.string "username" t.string "email" http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/dc8acc0e/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/zookeeper/ShardCollector.java ---------------------------------------------------------------------- diff --git a/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/zookeeper/ShardCollector.java b/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/zookeeper/ShardCollector.java index fa9a9f0..0b4ba5d 100644 --- a/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/zookeeper/ShardCollector.java +++ b/contrib/blur-console/blur-agent/src/main/java/org/apache/blur/agent/collectors/zookeeper/ShardCollector.java @@ -44,7 +44,7 @@ public class ShardCollector implements Runnable { @Override public void run() { try { - List<String> shards = this.zookeeper.getChildren("/blur/clusters/" + clusterName + "/online/shard-nodes", false); + List<String> shards = this.zookeeper.getChildren("/blur/clusters/" + clusterName + "/online-nodes", false); int recentlyOffline = this.database.markOfflineShards(shards, this.clusterId); if (recentlyOffline > 0) { Notifier.getNotifier().notifyShardOffline(this.database.getRecentOfflineShardNames(recentlyOffline)); @@ -61,7 +61,7 @@ public class ShardCollector implements Runnable { for (String shard : shards) { String blurVersion = "UNKNOWN"; - byte[] b = this.zookeeper.getData("/blur/clusters/" + clusterName + "/online/shard-nodes/" + shard, false, null); + byte[] b = this.zookeeper.getData("/blur/clusters/" + clusterName + "/online-nodes/" + shard, false, null); if (b != null && b.length > 0) { blurVersion = new String(b); }
