Revert "Sharded Operator Support"

This reverts commit e25d5e8.

Author: jmthomas

openc3/lib/openc3/models/interface_model.rb

@@ -50,7 +50,6 @@ class InterfaceModel < Model
     attr_accessor :work_dir
     attr_accessor :ports
     attr_accessor :prefix
-    attr_accessor :shard
 
     # NOTE: The following three class methods are used by the ModelController
     # and are reimplemented to enable various Model class methods to work
@@ -122,7 +121,6 @@ def initialize(
       env: {},
       container: nil,
       prefix: nil,
-      shard: 0,
       scope:
     )
       if self.class._get_type == 'INTERFACE'
@@ -160,7 +158,6 @@ def initialize(
       @env = env
       @container = container
       @prefix = prefix
-      @shard = shard.to_i # to_i to handle nil
       @secrets = secrets
     end
 
@@ -225,7 +222,6 @@ def as_json(*a)
         'env' => @env,
         'container' => @container,
         'prefix' => @prefix,
-        'shard' => @shard,
         'updated_at' => @updated_at
       }
     end
@@ -345,9 +341,6 @@ def handle_config(parser, keyword, parameters)
         parser.verify_num_parameters(1, 1, "#{keyword} <Route Prefix>")
         @prefix = parameters[0]
 
-      when 'SHARD'
-        parser.verify_num_parameters(1, 1, "#{keyword} <Shard Number Starting from 0>")
-        @shard = Integer(parameters[0])
       else
         raise ConfigParser::Error.new(parser, "Unknown keyword and parameters for Interface/Router: #{keyword} #{parameters.join(" ")}")
 
@@ -372,7 +365,6 @@ def deploy(gem_path, variables, validate_only: false)
         needs_dependencies: @needs_dependencies,
         secrets: @secrets,
         prefix: @prefix,
-        shard: @shard,
         scope: @scope
       )
       unless validate_only

openc3/lib/openc3/models/microservice_model.rb

@@ -44,7 +44,6 @@ class MicroserviceModel < Model
     attr_accessor :prefix
     attr_accessor :disable_erb
     attr_accessor :ignore_changes
-    attr_accessor :shard
 
     # NOTE: The following three class methods are used by the ModelController
     # and are reimplemented to enable various Model class methods to work
@@ -106,7 +105,6 @@ def initialize(
       prefix: nil,
       disable_erb: nil,
       ignore_changes: nil,
-      shard: 0,
       scope:
     )
       parts = name.split("__")
@@ -133,7 +131,6 @@ def initialize(
       @prefix = prefix
       @disable_erb = disable_erb
       @ignore_changes = ignore_changes
-      @shard = shard.to_i # to_i to handle nil
       @bucket = Bucket.getClient()
     end
 
@@ -156,8 +153,7 @@ def as_json(*a)
         'secrets' => @secrets.as_json(*a),
         'prefix' => @prefix,
         'disable_erb' => @disable_erb,
-        'ignore_changes' => @ignore_changes,
-        'shard' => @shard,
+        'ignore_changes' => @ignore_changes
       }
     end
 
@@ -219,9 +215,6 @@ def handle_config(parser, keyword, parameters)
         if parameters
           @disable_erb.concat(parameters)
         end
-      when 'SHARD'
-        parser.verify_num_parameters(1, 1, "#{keyword} <Shard Number Starting from 0>")
-        @shard = Integer(parameters[0])
       else
         raise ConfigParser::Error.new(parser, "Unknown keyword and parameters for Microservice: #{keyword} #{parameters.join(" ")}")
       end

openc3/lib/openc3/models/reaction_model.rb

@@ -82,7 +82,7 @@ def self.delete(name:, scope:)
     end
 
     attr_reader :name, :scope, :snooze, :triggers, :actions, :enabled, :triggerLevel, :snoozed_until
-    attr_accessor :username, :shard
+    attr_accessor :username
 
     def initialize(
       name:,
@@ -94,7 +94,6 @@ def initialize(
       enabled: true,
       snoozed_until: nil,
       username: nil,
-      shard: 0,
       updated_at: nil
     )
       super("#{scope}#{PRIMARY_KEY}", name: name, scope: scope)
@@ -106,7 +105,6 @@ def initialize(
       @actions = validate_actions(actions)
       @triggers = validate_triggers(triggers)
       @username = username
-      @shard = shard.to_i # to_i to handle nil
       @updated_at = updated_at
     end
 
@@ -265,7 +263,6 @@ def as_json(*a)
         'triggers' => @triggers,
         'actions' => @actions,
         'username' => @username,
-        'shard' => @shard,
         'updated_at' => @updated_at
       }
     end
@@ -298,7 +295,6 @@ def create_microservice(topics:)
         topics: topics,
         target_names: [],
         plugin: nil,
-        shard: @shard,
         scope: @scope
       )
       microservice.create

openc3/lib/openc3/models/scope_model.rb

@@ -56,7 +56,6 @@ class ScopeModel < Model
     attr_accessor :cleanup_poll_time
     attr_accessor :command_authority
     attr_accessor :critical_commanding
-    attr_accessor :shard
 
     # NOTE: The following three class methods are used by the ModelController
     # and are reimplemented to enable various Model class methods to work
@@ -98,7 +97,6 @@ def initialize(name:,
       cleanup_poll_time: 900,
       command_authority: false,
       critical_commanding: "OFF",
-      shard: 0,
       updated_at: nil
     )
       super(
@@ -120,7 +118,6 @@ def initialize(name:,
       if not ["OFF", "NORMAL", "ALL"].include?(@critical_commanding)
         raise "Invalid value for critical_commanding: #{@critical_commanding}"
       end
-      @shard = shard.to_i # to_i to handle nil
       @children = []
     end
 
@@ -177,7 +174,6 @@ def as_json(*_a)
         'cleanup_poll_time' => @cleanup_poll_time,
         'command_authority' => @command_authority,
         'critical_commanding' => @critical_commanding,
-        'shard' => @shard,
        }
     end
 
@@ -198,7 +194,6 @@ def deploy_openc3_log_messages_microservice(gem_path, variables, parent)
         ],
         topics: topics,
         parent: parent,
-        shard: @shard,
         scope: @scope
       )
       microservice.create
@@ -221,7 +216,6 @@ def deploy_unknown_commandlog_microservice(gem_path, variables, parent)
         topics: ["#{@scope}__COMMAND__{UNKNOWN}__UNKNOWN"],
         target_names: [],
         parent: parent,
-        shard: @shard,
         scope: @scope
       )
       microservice.create
@@ -244,7 +238,6 @@ def deploy_unknown_packetlog_microservice(gem_path, variables, parent)
         topics: ["#{@scope}__TELEMETRY__{UNKNOWN}__UNKNOWN"],
         target_names: [],
         parent: parent,
-        shard: @shard,
         scope: @scope
       )
       microservice.create
@@ -260,7 +253,6 @@ def deploy_periodic_microservice(gem_path, variables, parent)
         cmd: ["ruby", "periodic_microservice.rb", microservice_name],
         work_dir: '/openc3/lib/openc3/microservices',
         parent: parent,
-        shard: @shard,
         scope: @scope
       )
       microservice.create
@@ -276,7 +268,6 @@ def deploy_scopecleanup_microservice(gem_path, variables, parent)
         cmd: ["ruby", "scope_cleanup_microservice.rb", microservice_name],
         work_dir: '/openc3/lib/openc3/microservices',
         parent: parent,
-        shard: @shard,
         scope: @scope
       )
       microservice.create
@@ -292,7 +283,6 @@ def deploy_critical_cmd_microservice(gem_path, variables, parent)
         cmd: ["ruby", "critical_cmd_microservice.rb", microservice_name],
         work_dir: '/openc3-enterprise/lib/openc3-enterprise/microservices',
         parent: parent,
-        shard: @shard,
         scope: @scope
       )
       microservice.create
@@ -308,7 +298,6 @@ def deploy_scopemulti_microservice(gem_path, variables)
         cmd: ["ruby", "multi_microservice.rb", *@children],
         work_dir: '/openc3/lib/openc3/microservices',
         target_names: [],
-        shard: @shard,
         scope: @scope
       )
       microservice.create
@@ -323,14 +312,14 @@ def deploy(gem_path, variables)
         # Create DEFAULT trigger group model
         model = TriggerGroupModel.get(name: 'DEFAULT', scope: @scope)
         unless model
-          model = TriggerGroupModel.new(name: 'DEFAULT', shard: @shard, scope: @scope)
+          model = TriggerGroupModel.new(name: 'DEFAULT', scope: @scope)
           model.create()
           model.deploy()
         end
       end
 
       # Create UNKNOWN target for display of unknown data
-      model = TargetModel.new(name: "UNKNOWN", shard: @shard, scope: @scope)
+      model = TargetModel.new(name: "UNKNOWN", scope: @scope)
       model.create
 
       @parent = "#{@scope}__SCOPEMULTI__#{@scope}"

openc3/lib/openc3/models/target_model.rb

@@ -80,7 +80,6 @@ class TargetModel < Model
     attr_accessor :target_microservices
     attr_accessor :children
     attr_accessor :disable_erb
-    attr_accessor :shard
 
     # NOTE: The following three class methods are used by the ModelController
     # and are reimplemented to enable various Model class methods to work
@@ -346,7 +345,6 @@ def initialize(
       reducer_disable: false,
       reducer_max_cpu_utilization: 30.0,
       disable_erb: nil,
-      shard: 0,
       scope:
     )
       super("#{scope}__#{PRIMARY_KEY}", name: name, plugin: plugin, updated_at: updated_at,
@@ -395,7 +393,6 @@ def initialize(
       @reducer_disable = reducer_disable
       @reducer_max_cpu_utilization = reducer_max_cpu_utilization
       @disable_erb = disable_erb
-      @shard = shard.to_i # to_i to handle nil
       @bucket = Bucket.getClient()
       @children = []
     end
@@ -436,8 +433,7 @@ def as_json(*_a)
         'target_microservices' => @target_microservices.as_json(:allow_nan => true),
         'reducer_disable' => @reducer_disable,
         'reducer_max_cpu_utilization' => @reducer_max_cpu_utilization,
-        'disable_erb' => @disable_erb,
-        'shard' => @shard,
+        'disable_erb' => @disable_erb
       }
     end
 
@@ -552,10 +548,6 @@ def handle_config(parser, keyword, parameters)
         if parameters
           @disable_erb.concat(parameters)
         end
-      when 'SHARD'
-        parser.verify_num_parameters(1, 1, "#{keyword} <Shard Number Starting from 0>")
-        @shard = Integer(parameters[0])
-
       else
         raise ConfigParser::Error.new(parser, "Unknown keyword and parameters for Target: #{keyword} #{parameters.join(" ")}")
       end
@@ -930,7 +922,6 @@ def deploy_commmandlog_microservice(gem_path, variables, topics, instance = nil,
         plugin: @plugin,
         parent: parent,
         needs_dependencies: @needs_dependencies,
-        shard: @shard,
         scope: @scope
       )
       microservice.create
@@ -957,7 +948,6 @@ def deploy_decomcmdlog_microservice(gem_path, variables, topics, instance = nil,
         plugin: @plugin,
         parent: parent,
         needs_dependencies: @needs_dependencies,
-        shard: @shard,
         scope: @scope
       )
       microservice.create
@@ -984,7 +974,6 @@ def deploy_packetlog_microservice(gem_path, variables, topics, instance = nil, p
         plugin: @plugin,
         parent: parent,
         needs_dependencies: @needs_dependencies,
-        shard: @shard,
         scope: @scope
       )
       microservice.create
@@ -1011,7 +1000,6 @@ def deploy_decomlog_microservice(gem_path, variables, topics, instance = nil, pa
         plugin: @plugin,
         parent: parent,
         needs_dependencies: @needs_dependencies,
-        shard: @shard,
         scope: @scope
       )
       microservice.create
@@ -1040,7 +1028,6 @@ def deploy_decom_microservice(target, gem_path, variables, topics, instance = ni
         plugin: @plugin,
         parent: parent,
         needs_dependencies: @needs_dependencies,
-        shard: @shard,
         scope: @scope
       )
       microservice.create
@@ -1064,7 +1051,6 @@ def deploy_reducer_microservice(gem_path, variables, topics, instance = nil, par
         plugin: @plugin,
         parent: parent,
         needs_dependencies: @needs_dependencies,
-        shard: @shard,
         scope: @scope
       )
       microservice.create
@@ -1081,7 +1067,6 @@ def deploy_cleanup_microservice(gem_path, variables, instance = nil, parent = ni
         work_dir: '/openc3/lib/openc3/microservices',
         plugin: @plugin,
         parent: parent,
-        shard: @shard,
         scope: @scope
       )
       microservice.create
@@ -1099,7 +1084,6 @@ def deploy_multi_microservice(gem_path, variables, instance = nil)
           work_dir: '/openc3/lib/openc3/microservices',
           plugin: @plugin,
           needs_dependencies: @needs_dependencies,
-          shard: @shard,
           scope: @scope
         )
         microservice.create

openc3/lib/openc3/models/timeline_model.rb

@@ -74,15 +74,14 @@ def self.from_json(json, name:, scope:)
       self.new(**json.transform_keys(&:to_sym), name: name, scope: scope)
     end
 
-    def initialize(name:, scope:, updated_at: nil, color: nil, shard: 0)
+    def initialize(name:, scope:, updated_at: nil, color: nil)
       if name.nil? || scope.nil?
         raise TimelineInputError.new "name or scope must not be nil"
       end
 
       super(PRIMARY_KEY, name: "#{scope}#{KEY}#{name}", scope: scope)
       @updated_at = updated_at
       @timeline_name = name
-      @shard = shard.to_i # to_i to handle nil
       update_color(color: color)
     end
 
@@ -105,7 +104,6 @@ def as_json(*a)
       {
         'name' => @timeline_name,
         'color' => @color,
-        'shard' => @shard,
         'scope' => @scope,
         'updated_at' => @updated_at
       }
@@ -138,7 +136,6 @@ def deploy
         topics: topics,
         target_names: [],
         plugin: nil,
-        shard: @shard,
         scope: @scope
       )
       microservice.create